Bug 510889 - [GMFT] Fork gmft.runtime

 - rename the plugin as
org.eclipse.papyrus.infra.gmfdiag.tooling.runtime
 - integrate in Papyrus build 
 - add the plugin to gmfdiag feature  
 - change dependency in infra.gmfdiag.common
 - change xtend templates
 - re-genenerate all diagrams
    - fix missing keys using full namespace
    - fix wrong version number
    - impossible to regenerate InteractionOverview (no gmfgen)
    - Remaining generated not in Activity and Timing 
    - keep hand made code in UMLNavigatorLabelProvider for Sequence
Diagram

Change-Id: I1c1b988eafff38eae56a789d6a8734083c1117d4
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

131 files changed, 5324 insertions, 6651 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
index 561a4d0e6fd..2fd668b202a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
@@ -1,72 +1,73 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.deployment,
- org.eclipse.papyrus.uml.diagram.deployment.custom.actions,
- org.eclipse.papyrus.uml.diagram.deployment.custom.edit.command,
- org.eclipse.papyrus.uml.diagram.deployment.custom.edit.helpers,
- org.eclipse.papyrus.uml.diagram.deployment.custom.edit.part,
- org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies,
- org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.itemsemantic,
- org.eclipse.papyrus.uml.diagram.deployment.custom.factory,
- org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes,
- org.eclipse.papyrus.uml.diagram.deployment.custom.messages,
- org.eclipse.papyrus.uml.diagram.deployment.custom.providers,
- org.eclipse.papyrus.uml.diagram.deployment.edit.helpers,
- org.eclipse.papyrus.uml.diagram.deployment.edit.parts,
- org.eclipse.papyrus.uml.diagram.deployment.edit.policies,
- org.eclipse.papyrus.uml.diagram.deployment.expressions,
- org.eclipse.papyrus.uml.diagram.deployment.parsers,
- org.eclipse.papyrus.uml.diagram.deployment.part,
- org.eclipse.papyrus.uml.diagram.deployment.preferences,
- org.eclipse.papyrus.uml.diagram.deployment.providers,
- org.eclipse.papyrus.uml.diagram.deployment.sheet
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.diagram.common,
- org.eclipse.papyrus.infra.gmfdiag.common,
- org.eclipse.papyrus.infra.widgets,
- org.eclipse.papyrus.infra.ui,
- org.eclipse.papyrus.infra.core.sashwindows.di,
- org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.draw2d;visibility:=reexport,
- org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport,
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.uml2.uml.edit;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.emf.validation;visibility:=reexport,
- org.eclipse.gmf.tooling.runtime;visibility:=reexport,
- org.eclipse.gef,
- org.eclipse.papyrus.extensionpoints.editors,
- org.eclipse.papyrus.infra.services.edit,
- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
-Bundle-Vendor: %providerName
-Eclipse-LazyStart: true
-Bundle-Version: 3.0.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment; singleton:=true
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.deployment,

+ org.eclipse.papyrus.uml.diagram.deployment.custom.actions,

+ org.eclipse.papyrus.uml.diagram.deployment.custom.edit.command,

+ org.eclipse.papyrus.uml.diagram.deployment.custom.edit.helpers,

+ org.eclipse.papyrus.uml.diagram.deployment.custom.edit.part,

+ org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies,

+ org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.itemsemantic,

+ org.eclipse.papyrus.uml.diagram.deployment.custom.factory,

+ org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes,

+ org.eclipse.papyrus.uml.diagram.deployment.custom.messages,

+ org.eclipse.papyrus.uml.diagram.deployment.custom.migration,

+ org.eclipse.papyrus.uml.diagram.deployment.custom.providers,

+ org.eclipse.papyrus.uml.diagram.deployment.edit.helpers,

+ org.eclipse.papyrus.uml.diagram.deployment.edit.parts,

+ org.eclipse.papyrus.uml.diagram.deployment.edit.policies,

+ org.eclipse.papyrus.uml.diagram.deployment.expressions,

+ org.eclipse.papyrus.uml.diagram.deployment.parsers,

+ org.eclipse.papyrus.uml.diagram.deployment.part,

+ org.eclipse.papyrus.uml.diagram.deployment.preferences,

+ org.eclipse.papyrus.uml.diagram.deployment.providers,

+ org.eclipse.papyrus.uml.diagram.deployment.sheet

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",

+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",

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

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

+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",

+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",

+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",

+ org.eclipse.core.runtime,

+ org.eclipse.core.resources,

+ org.eclipse.jface,

+ org.eclipse.ui.ide,

+ org.eclipse.ui.views,

+ org.eclipse.emf.ecore,

+ org.eclipse.emf.ecore.xmi,

+ org.eclipse.emf.edit.ui,

+ org.eclipse.gmf.runtime.emf.core,

+ org.eclipse.gmf.runtime.emf.commands.core,

+ org.eclipse.gmf.runtime.emf.ui.properties,

+ org.eclipse.gmf.runtime.diagram.ui,

+ org.eclipse.papyrus.uml.diagram.common,

+ org.eclipse.papyrus.infra.gmfdiag.common,

+ org.eclipse.papyrus.infra.widgets,

+ org.eclipse.papyrus.infra.ui,

+ org.eclipse.papyrus.infra.core.sashwindows.di,

+ org.eclipse.gmf.runtime.diagram.ui.properties,

+ org.eclipse.gmf.runtime.diagram.ui.providers,

+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,

+ org.eclipse.draw2d;visibility:=reexport,

+ org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport,

+ org.eclipse.uml2.uml;visibility:=reexport,

+ org.eclipse.uml2.uml.edit;visibility:=reexport,

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

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

+ org.eclipse.emf.validation;visibility:=reexport,

+ org.eclipse.gef,

+ org.eclipse.papyrus.extensionpoints.editors,

+ org.eclipse.papyrus.infra.services.edit,

+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

+ org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;visibility:=reexport

+Bundle-Vendor: %providerName

+Eclipse-LazyStart: true

+Bundle-Version: 3.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment; singleton:=true

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/UMLBaseEditHelper.java
index b535d15c686..7f03f02fa83 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/UMLBaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/UMLBaseEditHelper.java
@@ -1,20 +1,21 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.helpers;

 

-import org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.helpers.GeneratedEditHelperBase;

 

 /**

  * @generated

  */

 public class UMLBaseEditHelper extends GeneratedEditHelperBase {

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPart.java
index 0c5b2777c54..1fa17a7f64b 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -25,10 +25,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -54,7 +54,6 @@ public class ArtifactCompositeCompartmentEditPart extends LinkLFShapeCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.ArtifactCompositeCompartmentEditPart_title;

 	}

@@ -62,7 +61,6 @@ public class ArtifactCompositeCompartmentEditPart extends LinkLFShapeCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

@@ -70,8 +68,8 @@ public class ArtifactCompositeCompartmentEditPart extends LinkLFShapeCompartment
 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ArtifactCompositeCompartmentCanonicalEditPolicy());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ArtifactCompositeCompartmentCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -81,7 +79,6 @@ public class ArtifactCompositeCompartmentEditPart extends LinkLFShapeCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -91,7 +88,6 @@ public class ArtifactCompositeCompartmentEditPart extends LinkLFShapeCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -100,7 +96,6 @@ public class ArtifactCompositeCompartmentEditPart extends LinkLFShapeCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -122,16 +117,12 @@ public class ArtifactCompositeCompartmentEditPart extends LinkLFShapeCompartment
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPartACN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPartACN.java
index 32dbc5719f0..e2c512b3ec0 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPartACN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPartACN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -25,10 +25,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -54,7 +54,6 @@ public class ArtifactCompositeCompartmentEditPartACN extends LinkLFShapeCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.ArtifactCompositeCompartmentEditPartACN_title;

 	}

@@ -62,7 +61,6 @@ public class ArtifactCompositeCompartmentEditPartACN extends LinkLFShapeCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

@@ -70,8 +68,8 @@ public class ArtifactCompositeCompartmentEditPartACN extends LinkLFShapeCompartm
 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ArtifactCompositeCompartmentCanonicalEditPolicyACN());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ArtifactCompositeCompartmentCanonicalEditPolicyACN());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -81,7 +79,6 @@ public class ArtifactCompositeCompartmentEditPartACN extends LinkLFShapeCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -91,7 +88,6 @@ public class ArtifactCompositeCompartmentEditPartACN extends LinkLFShapeCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -100,7 +96,6 @@ public class ArtifactCompositeCompartmentEditPartACN extends LinkLFShapeCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -122,16 +117,12 @@ public class ArtifactCompositeCompartmentEditPartACN extends LinkLFShapeCompartm
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPartCN.java
index d5c79943f17..ad6d69bf94c 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -25,10 +25,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -54,7 +54,6 @@ public class ArtifactCompositeCompartmentEditPartCN extends LinkLFShapeCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.ArtifactCompositeCompartmentEditPartCN_title;

 	}

@@ -62,7 +61,6 @@ public class ArtifactCompositeCompartmentEditPartCN extends LinkLFShapeCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

@@ -70,8 +68,8 @@ public class ArtifactCompositeCompartmentEditPartCN extends LinkLFShapeCompartme
 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ArtifactCompositeCompartmentCanonicalEditPolicyCN());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ArtifactCompositeCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -81,7 +79,6 @@ public class ArtifactCompositeCompartmentEditPartCN extends LinkLFShapeCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -91,7 +88,6 @@ public class ArtifactCompositeCompartmentEditPartCN extends LinkLFShapeCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -100,7 +96,6 @@ public class ArtifactCompositeCompartmentEditPartCN extends LinkLFShapeCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -122,16 +117,12 @@ public class ArtifactCompositeCompartmentEditPartCN extends LinkLFShapeCompartme
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java
index 2057acbe45a..b6b2f6387e9 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -86,7 +86,6 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -95,10 +94,13 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

@@ -151,11 +153,9 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

@@ -164,8 +164,7 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (false == notifier instanceof Edge

-					&& false == notifier instanceof BasicCompartment) {

+			if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

@@ -178,17 +177,14 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ArtifactFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.ArtifactFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ArtifactFigure getPrimaryShape() {

 		return (ArtifactFigure) primaryShape;

 	}

@@ -202,10 +198,9 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ArtifactCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((ArtifactCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

@@ -231,7 +226,6 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -242,7 +236,6 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -253,7 +246,6 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof ArtifactCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

@@ -267,7 +259,6 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

 		if (borderItemEditPart instanceof ArtifactFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

@@ -280,7 +271,6 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);

 		return result;

@@ -288,13 +278,12 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -303,12 +292,9 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -321,7 +307,6 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -332,7 +317,6 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -342,7 +326,6 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -350,7 +333,6 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -360,8 +342,8 @@ public class ArtifactEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java
index f4a29245bcb..dc34e533c7e 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -86,7 +86,6 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -95,10 +94,13 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

@@ -151,11 +153,9 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

@@ -164,8 +164,7 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (false == notifier instanceof Edge

-					&& false == notifier instanceof BasicCompartment) {

+			if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

@@ -178,17 +177,14 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ArtifactFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.ArtifactFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ArtifactFigure getPrimaryShape() {

 		return (ArtifactFigure) primaryShape;

 	}

@@ -202,10 +198,9 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ArtifactCompositeCompartmentEditPartACN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((ArtifactCompositeCompartmentEditPartACN) childEditPart).getFigure());

 			return true;

 		}

@@ -231,7 +226,6 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -242,7 +236,6 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -253,7 +246,6 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof ArtifactCompositeCompartmentEditPartACN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

@@ -267,7 +259,6 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

 		if (borderItemEditPart instanceof ArtifactFloatingLabelEditPartACN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

@@ -280,7 +271,6 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);

 		return result;

@@ -288,13 +278,12 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -303,12 +292,9 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -321,7 +307,6 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -332,7 +317,6 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -342,7 +326,6 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -350,7 +333,6 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -360,8 +342,8 @@ public class ArtifactEditPartACN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactNameEditPartACN.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java
index 0196c085b81..8a7fd7e40fb 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -86,7 +86,6 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -95,10 +94,13 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

@@ -151,11 +153,9 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

@@ -164,8 +164,7 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (false == notifier instanceof Edge

-					&& false == notifier instanceof BasicCompartment) {

+			if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

@@ -178,17 +177,14 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ArtifactFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.ArtifactFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ArtifactFigure getPrimaryShape() {

 		return (ArtifactFigure) primaryShape;

 	}

@@ -202,10 +198,9 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ArtifactCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((ArtifactCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

@@ -231,7 +226,6 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -242,7 +236,6 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -253,7 +246,6 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof ArtifactCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

@@ -267,7 +259,6 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

 		if (borderItemEditPart instanceof ArtifactFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

@@ -280,7 +271,6 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);

 		return result;

@@ -288,13 +278,12 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -303,12 +292,9 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -321,7 +307,6 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -332,7 +317,6 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -342,7 +326,6 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -350,7 +333,6 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -360,8 +342,8 @@ public class ArtifactEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactNameEditPartCN.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPart.java
index b3221c8c33b..737e5274f00 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -113,22 +113,24 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * 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.deployment.edit.parts.ArtifactFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -141,7 +143,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -152,7 +153,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

 		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

@@ -165,7 +165,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

@@ -240,7 +239,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -248,7 +246,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -281,8 +278,7 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -294,7 +290,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -310,13 +305,11 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -330,7 +323,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -340,12 +332,14 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ArtifactFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														ArtifactFloatingLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -363,7 +357,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -374,7 +367,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -382,7 +374,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Artifact_Shape, getParserElement(), this, VISUAL_ID);

@@ -445,7 +436,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -473,13 +463,18 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -491,7 +486,8 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -517,9 +513,10 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 				@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);

+						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();

@@ -535,7 +532,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -571,8 +567,7 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @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());

 		}

@@ -589,8 +584,7 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @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());

 		}

@@ -599,15 +593,11 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -615,7 +605,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -623,7 +612,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -639,7 +627,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -653,7 +640,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -676,7 +662,7 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * 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

 	 */

@@ -695,7 +681,7 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -708,7 +694,7 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -718,42 +704,43 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -762,11 +749,13 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -783,7 +772,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -793,10 +781,10 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 			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())) {

@@ -819,7 +807,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -832,4 +819,5 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPartACN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPartACN.java
index 1cbeab45a86..6ceff97ee04 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPartACN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPartACN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -113,22 +113,23 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 

 	/**

 	 * 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.deployment.edit.parts.ArtifactFloatingLabelEditPartACN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(

+				org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactFloatingLabelEditPartACN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -141,7 +142,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -152,7 +152,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

 		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

@@ -165,7 +164,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

@@ -240,7 +238,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -248,7 +245,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -281,8 +277,7 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -294,7 +289,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -310,13 +304,11 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -330,7 +322,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -340,12 +331,16 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ArtifactFloatingLabelEditPartACN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ArtifactFloatingLabelEditPartACN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -363,7 +358,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -374,7 +368,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -382,7 +375,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Artifact_Shape_ACN, getParserElement(), this, VISUAL_ID);

@@ -445,7 +437,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -473,13 +464,18 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -491,7 +487,8 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -517,9 +514,10 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 				@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);

+						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();

@@ -535,7 +533,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -571,8 +568,7 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	 * @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());

 		}

@@ -589,8 +585,7 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	 * @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());

 		}

@@ -599,15 +594,11 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -615,7 +606,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -623,7 +613,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -639,7 +628,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -653,7 +641,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -676,7 +663,7 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 

 	/**

 	 * 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

 	 */

@@ -695,7 +682,7 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -708,7 +695,7 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -718,42 +705,43 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -762,11 +750,13 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -783,7 +773,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -793,10 +782,10 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 			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())) {

@@ -819,7 +808,6 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -832,4 +820,5 @@ public class ArtifactFloatingLabelEditPartACN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPartCN.java
index 361081bdab0..340137a5d44 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -113,22 +113,23 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * 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.deployment.edit.parts.ArtifactFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(

+				org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -141,7 +142,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -152,7 +152,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

 		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

@@ -165,7 +164,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

@@ -240,7 +238,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -248,7 +245,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -281,8 +277,7 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -294,7 +289,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -310,13 +304,11 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -330,7 +322,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -340,12 +331,14 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ArtifactFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														ArtifactFloatingLabelEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -363,7 +356,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -374,7 +366,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -382,7 +373,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Artifact_Shape_CCN, getParserElement(), this, VISUAL_ID);

@@ -445,7 +435,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -473,13 +462,18 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -491,7 +485,8 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -517,9 +512,10 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 				@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);

+						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();

@@ -535,7 +531,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -571,8 +566,7 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @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());

 		}

@@ -589,8 +583,7 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @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());

 		}

@@ -599,15 +592,11 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -615,7 +604,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -623,7 +611,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -639,7 +626,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -653,7 +639,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -676,7 +661,7 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * 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

 	 */

@@ -695,7 +680,7 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -708,7 +693,7 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -718,42 +703,43 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -762,11 +748,13 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -783,7 +771,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -793,10 +780,10 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 			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())) {

@@ -819,7 +806,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -832,4 +818,5 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPart.java
index 413c783bddf..09360626f3c 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ArtifactNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ArtifactNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Artifact_Shape, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class ArtifactNameEditPart 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());

 		}

@@ -561,8 +552,7 @@ public class ArtifactNameEditPart 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());

 		}

@@ -571,15 +561,11 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class ArtifactNameEditPart 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())) {

@@ -810,7 +792,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPartACN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPartACN.java
index e06cbbfdb38..9bff8a54499 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPartACN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPartACN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ArtifactNameEditPartACN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ArtifactNameEditPartACN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Artifact_Shape_ACN, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class ArtifactNameEditPartACN 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());

 		}

@@ -561,8 +552,7 @@ public class ArtifactNameEditPartACN 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());

 		}

@@ -571,15 +561,11 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class ArtifactNameEditPartACN 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())) {

@@ -810,7 +792,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class ArtifactNameEditPartACN extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPartCN.java
index 4db4892a2d5..51cf9a1811b 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ArtifactNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ArtifactNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Artifact_Shape_CCN, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class ArtifactNameEditPartCN 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());

 		}

@@ -561,8 +552,7 @@ public class ArtifactNameEditPartCN 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());

 		}

@@ -571,15 +561,11 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class ArtifactNameEditPartCN 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())) {

@@ -810,7 +792,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentAnnotatedElementEditPart.java
index 8abf169c932..e421d095a6a 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentAnnotatedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentAnnotatedElementEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -20,8 +20,8 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPar
 import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

 

 /**

- * @generated

- */

+	 * @generated

+	 */

 public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

@@ -39,7 +39,6 @@ public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -47,13 +46,12 @@ public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart i
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new SimpleDashedEdgeFigure();

 	}

@@ -61,8 +59,8 @@ public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public SimpleDashedEdgeFigure getPrimaryShape() {

 		return (SimpleDashedEdgeFigure) getFigure();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentBodyEditPart.java
index ebccc29c49b..7edcf770048 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentBodyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentBodyEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), CommentBodyEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), CommentBodyEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Comment_Shape, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class CommentBodyEditPart 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());

 		}

@@ -561,8 +552,7 @@ public class CommentBodyEditPart 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());

 		}

@@ -571,15 +561,11 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class CommentBodyEditPart 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())) {

@@ -810,7 +792,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentBodyEditPartCN.java
index c961a8f648d..f270c7c422c 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentBodyEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentBodyEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), CommentBodyEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), CommentBodyEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Comment_Shape_CN, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class CommentBodyEditPartCN 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());

 		}

@@ -561,8 +552,7 @@ public class CommentBodyEditPartCN 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());

 		}

@@ -571,15 +561,11 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class CommentBodyEditPartCN 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())) {

@@ -810,7 +792,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPart.java
index 09f16b86cbc..076b36f7a62 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -70,7 +70,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -78,7 +77,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusReflowableShapeEditPolicy());

@@ -115,11 +115,9 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -128,17 +126,14 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new HTMLCornerBentFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public HTMLCornerBentFigure getPrimaryShape() {

 		return (HTMLCornerBentFigure) primaryShape;

 	}

@@ -152,7 +147,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -169,7 +163,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -180,7 +173,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -191,7 +183,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

@@ -199,7 +190,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -207,13 +197,12 @@ public class CommentEditPart extends AbstractCommentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -222,12 +211,9 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -240,7 +226,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -251,7 +236,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -261,7 +245,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -269,7 +252,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -279,8 +261,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPartCN.java
index c3aff052066..7464632b1c1 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -70,7 +70,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -78,7 +77,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusReflowableShapeEditPolicy());

@@ -115,11 +115,9 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -128,17 +126,14 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new HTMLCornerBentFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public HTMLCornerBentFigure getPrimaryShape() {

 		return (HTMLCornerBentFigure) primaryShape;

 	}

@@ -152,7 +147,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -169,7 +163,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -180,7 +173,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -191,7 +183,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

@@ -199,7 +190,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -207,13 +197,12 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -222,12 +211,9 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -240,7 +226,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -251,7 +236,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -261,7 +245,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -269,7 +252,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -279,8 +261,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommunicationPathAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommunicationPathAppliedStereotypeEditPart.java
index 5067675a7a6..0c2a23f91de 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommunicationPathAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommunicationPathAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -111,22 +111,23 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 

 	/**

 	 * 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.deployment.edit.parts.CommunicationPathAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(

+				org.eclipse.papyrus.uml.diagram.deployment.edit.parts.CommunicationPathAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -150,7 +151,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -221,7 +221,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -229,7 +228,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -237,7 +235,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -263,8 +260,7 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -276,7 +272,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -292,13 +287,11 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -312,7 +305,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -322,12 +314,15 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), CommunicationPathAppliedStereotypeEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														CommunicationPathAppliedStereotypeEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -345,7 +340,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -356,7 +350,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -364,7 +357,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.CommunicationPath_Edge, getParserElement(), this, VISUAL_ID);

@@ -427,7 +419,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -455,13 +446,18 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -473,7 +469,8 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -499,9 +496,10 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 				@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);

+						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();

@@ -517,7 +515,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -553,8 +550,7 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	 * @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());

 		}

@@ -571,8 +567,7 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	 * @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());

 		}

@@ -581,15 +576,11 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -597,7 +588,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -605,7 +595,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -621,7 +610,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -635,7 +623,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -658,7 +645,7 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 

 	/**

 	 * 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

 	 */

@@ -677,7 +664,7 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -690,7 +677,7 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -700,42 +687,43 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -744,11 +732,13 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -765,7 +755,6 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -775,10 +764,10 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 			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())) {

@@ -802,9 +791,9 @@ public class CommunicationPathAppliedStereotypeEditPart extends PapyrusLabelEdit
 	/**

 	 * @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.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommunicationPathEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommunicationPathEditPart.java
index d38809cf891..9567a2f650e 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommunicationPathEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommunicationPathEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -18,14 +18,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.AssociationFigure;

 

 /**

- * @generated

- */

+	 * @generated

+	 */

 public class CommunicationPathEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

@@ -43,11 +42,11 @@ public class CommunicationPathEditPart extends UMLConnectionNodeEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

 	}

 

@@ -56,12 +55,11 @@ public class CommunicationPathEditPart extends UMLConnectionNodeEditPart impleme
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof CommunicationPathNameEditPart) {

-			((CommunicationPathNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAssociationNameLabel());

+			((CommunicationPathNameEditPart) childEditPart).setLabel(getPrimaryShape().getAssociationNameLabel());

 		}

 		if (childEditPart instanceof CommunicationPathAppliedStereotypeEditPart) {

-			((CommunicationPathAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((CommunicationPathAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -69,7 +67,6 @@ public class CommunicationPathEditPart extends UMLConnectionNodeEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -93,7 +90,6 @@ public class CommunicationPathEditPart extends UMLConnectionNodeEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -103,13 +99,12 @@ public class CommunicationPathEditPart extends UMLConnectionNodeEditPart impleme
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new AssociationFigure();

 	}

@@ -117,8 +112,8 @@ public class CommunicationPathEditPart extends UMLConnectionNodeEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public AssociationFigure getPrimaryShape() {

 		return (AssociationFigure) getFigure();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommunicationPathNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommunicationPathNameEditPart.java
index cda2df722aa..2cdce214454 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommunicationPathNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommunicationPathNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -111,22 +111,24 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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.deployment.edit.parts.CommunicationPathNameEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.deployment.edit.parts.CommunicationPathNameEditPart.VISUAL_ID),

+				new Point(0, 40));

 	}

 

 	/**

@@ -150,7 +152,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -221,7 +222,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -229,7 +229,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -237,7 +236,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -263,8 +261,7 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -276,7 +273,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -292,13 +288,11 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -312,7 +306,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -322,12 +315,14 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), CommunicationPathNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														CommunicationPathNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -345,7 +340,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -356,7 +350,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -364,7 +357,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.CommunicationPath_Edge, getParserElement(), this, VISUAL_ID);

@@ -427,7 +419,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -455,13 +446,18 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -473,7 +469,8 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -499,9 +496,10 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 				@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);

+						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();

@@ -517,7 +515,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -553,8 +550,7 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -571,8 +567,7 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -581,15 +576,11 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -597,7 +588,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -605,7 +595,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -621,7 +610,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -635,7 +623,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -658,7 +645,7 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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

 	 */

@@ -677,7 +664,7 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -690,7 +677,7 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -700,42 +687,43 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -744,11 +732,13 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -765,7 +755,6 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -775,10 +764,10 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 			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())) {

@@ -802,9 +791,9 @@ public class CommunicationPathNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @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.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintConstrainedElementEditPart.java
index 65e8704e0d2..6346d4acbbe 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintConstrainedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintConstrainedElementEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -20,8 +20,8 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPar
 import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

 

 /**

- * @generated

- */

+	 * @generated

+	 */

 public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

@@ -39,7 +39,6 @@ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -47,13 +46,12 @@ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditP
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new SimpleDashedEdgeFigure();

 	}

@@ -61,8 +59,8 @@ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public SimpleDashedEdgeFigure getPrimaryShape() {

 		return (SimpleDashedEdgeFigure) getFigure();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPart.java
index accb28dd6a5..b669ec52765 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -69,7 +69,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -77,7 +76,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -113,11 +113,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -126,17 +124,14 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ConstraintFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ConstraintFigure getPrimaryShape() {

 		return (ConstraintFigure) primaryShape;

 	}

@@ -154,7 +149,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -174,7 +168,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -185,7 +178,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -196,7 +188,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

@@ -204,7 +195,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -212,13 +202,12 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -227,12 +216,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -245,7 +231,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -256,7 +241,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -266,7 +250,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -274,7 +257,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -284,8 +266,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPartCN.java
index 6a3a9a216ee..f38db52394a 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -69,7 +69,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -77,7 +76,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -113,11 +113,9 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -126,17 +124,14 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ConstraintFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ConstraintFigure getPrimaryShape() {

 		return (ConstraintFigure) primaryShape;

 	}

@@ -154,7 +149,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -174,7 +168,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -185,7 +178,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -196,7 +188,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

@@ -204,7 +195,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -212,13 +202,12 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -227,12 +216,9 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -245,7 +231,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -256,7 +241,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -266,7 +250,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -274,7 +257,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -284,8 +266,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintNameEditPart.java
index 490d05eaf0d..7c8f564087b 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ConstraintNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ConstraintNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Constraint_Shape, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class ConstraintNameEditPart 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());

 		}

@@ -561,8 +552,7 @@ public class ConstraintNameEditPart 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());

 		}

@@ -571,15 +561,11 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class ConstraintNameEditPart 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())) {

@@ -810,7 +792,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintNameEditPartCN.java
index 3eef2b33139..fc39525bf02 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintNameEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ConstraintNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ConstraintNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Constraint_Shape_CN, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class ConstraintNameEditPartCN 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());

 		}

@@ -561,8 +552,7 @@ public class ConstraintNameEditPartCN 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());

 		}

@@ -571,15 +561,11 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class ConstraintNameEditPartCN 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())) {

@@ -810,7 +792,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintSpecificationEditPart.java
index 541dd104059..1c8cf84d38d 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintSpecificationEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,14 @@ 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>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ConstraintSpecificationEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														ConstraintSpecificationEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +320,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +330,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +337,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Constraint_Shape, getParserElement(), this, VISUAL_ID);

@@ -411,7 +399,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +426,18 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +449,8 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +476,10 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +495,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +536,7 @@ 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());

 		}

@@ -561,8 +553,7 @@ 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());

 		}

@@ -571,15 +562,11 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +574,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +581,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +596,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +609,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +631,7 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +650,7 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +663,7 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +673,43 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +718,13 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +741,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +749,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +757,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +767,10 @@ 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())) {

@@ -810,7 +793,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +806,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +822,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +835,5 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintSpecificationEditPartCN.java
index 830ec56c953..737cf2cc992 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintSpecificationEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,16 @@ 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>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ConstraintSpecificationEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ConstraintSpecificationEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +322,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +332,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +339,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Constraint_Shape_CN, getParserElement(), this, VISUAL_ID);

@@ -411,7 +401,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +428,18 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +451,8 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +478,10 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 				@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);

+						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();

@@ -501,7 +497,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +538,7 @@ 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());

 		}

@@ -561,8 +555,7 @@ 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());

 		}

@@ -571,15 +564,11 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +576,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +583,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +598,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +611,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +633,7 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 	/**

 	 * 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

 	 */

@@ -667,7 +652,7 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +665,7 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +675,43 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +720,13 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +743,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +751,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +759,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +769,10 @@ 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())) {

@@ -810,7 +795,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +808,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +824,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +837,5 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java
index dd679db29ec..84ba459e845 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -72,7 +72,6 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -81,9 +80,11 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY, new DeploymentDiagramChangeStereotypedShapeEditpolicy());

+		installEditPolicy(ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY,

+				new DeploymentDiagramChangeStereotypedShapeEditpolicy());

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultNamedElementItemSemanticEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

@@ -118,11 +119,9 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -131,17 +130,14 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

 		return (RoundedCompartmentFigure) primaryShape;

 	}

@@ -155,7 +151,6 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -172,7 +167,6 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -183,7 +177,6 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -194,7 +187,6 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

@@ -202,7 +194,6 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 50);

 		return result;

@@ -210,13 +201,12 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -225,12 +215,9 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -243,7 +230,6 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -254,7 +240,6 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -264,7 +249,6 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -272,7 +256,6 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -282,8 +265,8 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DefaultNamedElementNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementNameEditPart.java
index 70dd3a83c4e..25f0f73837b 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -42,7 +42,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -64,9 +63,11 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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.deployment.edit.policies.UMLTextSelectionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

@@ -112,14 +113,12 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -134,7 +133,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -208,7 +206,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -216,7 +213,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -224,7 +220,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,7 +239,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 		if (parserElement == null) {

 			return null;

 		}

-		List<View> views = org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

 		for (View view : views) {

 			if (AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

@@ -260,8 +255,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -273,7 +267,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -289,13 +282,11 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -309,7 +300,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -319,12 +309,14 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DefaultNamedElementNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														DefaultNamedElementNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -342,7 +334,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -353,7 +344,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -361,10 +351,10 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.NamedElement_DefaultShape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.NamedElement_DefaultShape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -424,7 +414,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -452,13 +441,18 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -470,7 +464,8 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -496,9 +491,10 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -514,7 +510,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -556,8 +551,7 @@ public class DefaultNamedElementNameEditPart 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());

 		}

@@ -574,8 +568,7 @@ public class DefaultNamedElementNameEditPart 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());

 		}

@@ -584,15 +577,11 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -600,7 +589,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -608,7 +596,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -624,7 +611,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -638,7 +624,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -661,7 +646,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -680,7 +665,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -693,7 +678,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,42 +688,43 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -747,11 +733,13 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -768,7 +756,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -777,7 +764,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -786,7 +772,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -797,10 +782,10 @@ public class DefaultNamedElementNameEditPart 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())) {

@@ -817,7 +802,8 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -826,7 +812,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -840,7 +825,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -857,7 +841,6 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -871,4 +854,5 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyAppliedStereotypeEditPart.java
index 9176328e27b..2cf2a370ece 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyAppliedStereotypeEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -112,22 +112,23 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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.deployment.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(

+				org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -138,7 +139,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

@@ -151,7 +152,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -222,7 +222,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -230,7 +229,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -238,7 +236,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -264,8 +261,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -277,7 +273,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -293,13 +288,11 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -313,7 +306,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -323,12 +315,16 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DependencyAppliedStereotypeEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																DependencyAppliedStereotypeEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -346,7 +342,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -357,7 +352,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,7 +359,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Dependency_Edge, getParserElement(), this, VISUAL_ID);

@@ -428,7 +421,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -456,13 +448,18 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -474,7 +471,8 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -500,9 +498,10 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 				@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);

+						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();

@@ -518,7 +517,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -554,8 +552,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -572,8 +569,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -582,15 +578,11 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -598,7 +590,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,7 +597,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -622,7 +612,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -636,7 +625,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -659,7 +647,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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

 	 */

@@ -678,7 +666,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -691,7 +679,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,42 +689,43 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -745,11 +734,13 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -766,7 +757,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -776,10 +766,10 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 			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())) {

@@ -803,7 +793,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -812,7 +801,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getLabelRole() {

 		return "Stereotype";//$NON-NLS-1$

 	}

@@ -820,7 +808,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getIconPathRole() {

 		return "";//$NON-NLS-1$

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyBranchEditPart.java
index 4ecdd222f86..a9defcb7ab9 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyBranchEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -22,8 +22,8 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 

 /**

- * @generated

- */

+	 * @generated

+	 */

 public class DependencyBranchEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

@@ -41,7 +41,6 @@ public class DependencyBranchEditPart extends UMLConnectionNodeEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -50,13 +49,12 @@ public class DependencyBranchEditPart extends UMLConnectionNodeEditPart implemen
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new DashedEdgeFigure();

 	}

@@ -64,8 +62,8 @@ public class DependencyBranchEditPart extends UMLConnectionNodeEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public DashedEdgeFigure getPrimaryShape() {

 		return (DashedEdgeFigure) getFigure();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyEditPart.java
index d650c8d448a..dec0a524d7c 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -19,15 +19,14 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 

 /**

- * @generated

- */

+	 * @generated

+	 */

 public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

@@ -45,11 +44,11 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

@@ -59,12 +58,11 @@ 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;

 	}

@@ -72,7 +70,6 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -96,7 +93,6 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -106,13 +102,12 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new DashedEdgeFigure();

 	}

@@ -120,8 +115,8 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	public DashedEdgeFigure getPrimaryShape() {

 		return (DashedEdgeFigure) getFigure();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNameEditPart.java
index 3be3ee6b51d..43594978e2f 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -112,22 +112,24 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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.deployment.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DependencyNameEditPart.VISUAL_ID),

+				new Point(0, 40));

 	}

 

 	/**

@@ -138,7 +140,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

@@ -151,7 +153,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -222,7 +223,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -230,7 +230,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -238,7 +237,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -264,8 +262,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -277,7 +274,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -293,13 +289,11 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -313,7 +307,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -323,12 +316,13 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DependencyNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), DependencyNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -346,7 +340,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -357,7 +350,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,7 +357,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Dependency_Edge, getParserElement(), this, VISUAL_ID);

@@ -428,7 +419,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -456,13 +446,18 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -474,7 +469,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -500,9 +496,10 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 				@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);

+						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();

@@ -518,7 +515,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -554,8 +550,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -572,8 +567,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -582,15 +576,11 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -598,7 +588,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,7 +595,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -622,7 +610,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -636,7 +623,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -659,7 +645,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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

 	 */

@@ -678,7 +664,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -691,7 +677,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,42 +687,43 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -745,11 +732,13 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -766,7 +755,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -776,10 +764,10 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 			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())) {

@@ -803,7 +791,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -812,7 +799,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getLabelRole() {

 		return "Name";//$NON-NLS-1$

 	}

@@ -820,7 +806,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getIconPathRole() {

 		return "";//$NON-NLS-1$

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNodeEditPart.java
index 7ab4e2222b1..1be9207ed39 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNodeEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -74,7 +74,6 @@ public class DependencyNodeEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -135,17 +134,14 @@ public class DependencyNodeEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new DependencyNodeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.DependencyNodeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public DependencyNodeFigure getPrimaryShape() {

 		return (DependencyNodeFigure) primaryShape;

 	}

@@ -153,7 +149,6 @@ public class DependencyNodeEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

 		if (borderItemEditPart instanceof MultiDependencyLabelEditPart) {

 			BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH);

@@ -167,7 +162,6 @@ public class DependencyNodeEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(10, 10);

 		return result;

@@ -175,13 +169,12 @@ public class DependencyNodeEditPart extends NodeEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -190,12 +183,9 @@ public class DependencyNodeEditPart extends NodeEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		return nodeShape; // use nodeShape itself as contentPane

 	}

@@ -203,7 +193,6 @@ public class DependencyNodeEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -214,7 +203,6 @@ public class DependencyNodeEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -224,7 +212,6 @@ public class DependencyNodeEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -232,7 +219,6 @@ public class DependencyNodeEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -242,8 +228,8 @@ public class DependencyNodeEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(MultiDependencyLabelEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentAppliedStereotypeEditPart.java
index 6aaf8134551..0e8f5540971 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentAppliedStereotypeEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -112,22 +112,23 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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.deployment.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(

+				org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -138,7 +139,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

@@ -151,7 +152,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -222,7 +222,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -230,7 +229,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -238,7 +236,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -264,8 +261,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -277,7 +273,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -293,13 +288,11 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -313,7 +306,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -323,12 +315,16 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeploymentAppliedStereotypeEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																DeploymentAppliedStereotypeEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -346,7 +342,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -357,7 +352,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,7 +359,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Deployment_Edge, getParserElement(), this, VISUAL_ID);

@@ -428,7 +421,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -456,13 +448,18 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -474,7 +471,8 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -500,9 +498,10 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 				@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);

+						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();

@@ -518,7 +517,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -554,8 +552,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -572,8 +569,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -582,15 +578,11 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -598,7 +590,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,7 +597,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -622,7 +612,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -636,7 +625,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -659,7 +647,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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

 	 */

@@ -678,7 +666,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -691,7 +679,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,42 +689,43 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -745,11 +734,13 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -766,7 +757,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -776,10 +766,10 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 			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())) {

@@ -803,7 +793,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -812,7 +801,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getLabelRole() {

 		return "Stereotype";//$NON-NLS-1$

 	}

@@ -820,7 +808,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getIconPathRole() {

 		return "";//$NON-NLS-1$

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentDiagramEditPart.java
index 3ecfc4b8b46..2b644052eda 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentDiagramEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -45,7 +45,6 @@ public class DeploymentDiagramEditPart extends PapyrusDiagramEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 

@@ -53,11 +52,12 @@ public class DeploymentDiagramEditPart extends PapyrusDiagramEditPart {
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

 

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ModelCanonicalEditPolicy());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ModelCanonicalEditPolicy());

 

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentEditPart.java
index cf4b353a13b..43231d37ffb 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -18,14 +18,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

- * @generated

- */

+	 * @generated

+	 */

 public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

@@ -43,11 +42,11 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

 	}

 

@@ -56,12 +55,11 @@ 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;

 	}

@@ -69,7 +67,6 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -93,7 +90,6 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -103,13 +99,12 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITr
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new DashedEdgeFigure();

 	}

@@ -117,8 +112,8 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	public DashedEdgeFigure getPrimaryShape() {

 		return (DashedEdgeFigure) getFigure();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentNameEditPart.java
index b768aef7ff2..7e1597da3d8 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -112,22 +112,24 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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.deployment.edit.parts.DeploymentNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentNameEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -138,7 +140,7 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

@@ -151,7 +153,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -222,7 +223,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -230,7 +230,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -238,7 +237,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -264,8 +262,7 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -277,7 +274,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -293,13 +289,11 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -313,7 +307,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -323,12 +316,13 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeploymentNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), DeploymentNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -346,7 +340,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -357,7 +350,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,7 +357,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Deployment_Edge, getParserElement(), this, VISUAL_ID);

@@ -428,7 +419,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -456,13 +446,18 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -474,7 +469,8 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -500,9 +496,10 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 				@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);

+						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();

@@ -518,7 +515,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -554,8 +550,7 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -572,8 +567,7 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -582,15 +576,11 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -598,7 +588,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,7 +595,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -622,7 +610,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -636,7 +623,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -659,7 +645,7 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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

 	 */

@@ -678,7 +664,7 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -691,7 +677,7 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,42 +687,43 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -745,11 +732,13 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -766,7 +755,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -776,10 +764,10 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 			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())) {

@@ -803,7 +791,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -812,7 +799,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getLabelRole() {

 		return "Name";//$NON-NLS-1$

 	}

@@ -820,7 +806,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getIconPathRole() {

 		return "";//$NON-NLS-1$

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsClassifierEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsClassifierEditPart.java
index 0107f7d96f9..29b752c9fc7 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsClassifierEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsClassifierEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -85,7 +85,6 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -94,7 +93,8 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -148,11 +148,9 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

@@ -161,8 +159,7 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (false == notifier instanceof Edge

-					&& false == notifier instanceof BasicCompartment) {

+			if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

@@ -175,17 +172,14 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new DeploymentSpecificationFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.DeploymentSpecificationFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public DeploymentSpecificationFigure getPrimaryShape() {

 		return (DeploymentSpecificationFigure) primaryShape;

 	}

@@ -199,7 +193,6 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -216,7 +209,6 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -227,7 +219,6 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -238,7 +229,6 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

@@ -249,7 +239,6 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

 		if (borderItemEditPart instanceof DeploymentSpecAsClassifierFloatingLabelEditPart) {

 			BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH);

@@ -260,7 +249,9 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 		}

 	}

 

-	@Override

+	/**

+	 * @generated

+	 */

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);

 		return result;

@@ -268,13 +259,12 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -283,12 +273,9 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -301,7 +288,6 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -312,7 +298,6 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -322,7 +307,6 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -330,7 +314,6 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -340,8 +323,8 @@ public class DeploymentSpecAsClassifierEditPart extends RoundedCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecAsClassifierNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsClassifierFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsClassifierFloatingLabelEditPart.java
index aa2f8601487..ad48cddd6ca 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsClassifierFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsClassifierFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -113,22 +113,23 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 

 	/**

 	 * 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.deployment.edit.parts.DeploymentSpecAsClassifierFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(

+				org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentSpecAsClassifierFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -141,7 +142,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -152,7 +152,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

 		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

@@ -165,7 +164,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

@@ -240,7 +238,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -248,7 +245,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -281,8 +277,7 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -294,7 +289,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -310,13 +304,11 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -330,7 +322,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -340,12 +331,15 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeploymentSpecAsClassifierFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														DeploymentSpecAsClassifierFloatingLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -363,7 +357,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -374,7 +367,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -382,10 +374,10 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape_CCN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape_CCN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -445,7 +437,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -473,13 +464,18 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -491,7 +487,8 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -517,9 +514,10 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 				@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);

+						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();

@@ -535,7 +533,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -571,8 +568,7 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	 * @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());

 		}

@@ -589,8 +585,7 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	 * @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());

 		}

@@ -599,15 +594,11 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -615,7 +606,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -623,7 +613,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -639,7 +628,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -653,7 +641,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -676,7 +663,7 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 

 	/**

 	 * 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

 	 */

@@ -695,7 +682,7 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -708,7 +695,7 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -718,42 +705,43 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -762,11 +750,13 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -783,7 +773,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -793,10 +782,10 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 			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())) {

@@ -819,7 +808,6 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -832,4 +820,5 @@ public class DeploymentSpecAsClassifierFloatingLabelEditPart extends FloatingLab
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsClassifierNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsClassifierNameEditPart.java
index bab0bc318d6..b396c86376f 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsClassifierNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsClassifierNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,16 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeploymentSpecAsClassifierNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																DeploymentSpecAsClassifierNameEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +322,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +332,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,10 +339,10 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape_CCN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape_CCN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -411,7 +402,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +429,18 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +452,8 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +479,10 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 				@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);

+						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();

@@ -501,7 +498,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +539,7 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	 * @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());

 		}

@@ -561,8 +556,7 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	 * @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());

 		}

@@ -571,15 +565,11 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +577,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +584,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +599,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +612,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +634,7 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 

 	/**

 	 * 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

 	 */

@@ -667,7 +653,7 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +666,7 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +676,43 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +721,13 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +744,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +752,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +760,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +770,10 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 			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())) {

@@ -810,7 +796,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +809,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +825,6 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +838,5 @@ public class DeploymentSpecAsClassifierNameEditPart extends PapyrusCompartmentEd
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsNestedArtifactEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsNestedArtifactEditPart.java
index 1d22dbba579..8f3d2ca61f2 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsNestedArtifactEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsNestedArtifactEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -85,7 +85,6 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -94,7 +93,8 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -148,11 +148,9 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

@@ -161,8 +159,7 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (false == notifier instanceof Edge

-					&& false == notifier instanceof BasicCompartment) {

+			if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

@@ -175,17 +172,14 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new DeploymentSpecificationFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.DeploymentSpecificationFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public DeploymentSpecificationFigure getPrimaryShape() {

 		return (DeploymentSpecificationFigure) primaryShape;

 	}

@@ -199,7 +193,6 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -216,7 +209,6 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -227,7 +219,6 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -238,7 +229,6 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

@@ -249,7 +239,6 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

 		if (borderItemEditPart instanceof DeploymentSpecAsNestedArtifactFloatingLabelEditPart) {

 			BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH);

@@ -260,7 +249,9 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 		}

 	}

 

-	@Override

+	/**

+	 * @generated

+	 */

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);

 		return result;

@@ -268,13 +259,12 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -283,12 +273,9 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -301,7 +288,6 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -312,7 +298,6 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -322,7 +307,6 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -330,7 +314,6 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -340,8 +323,9 @@ public class DeploymentSpecAsNestedArtifactEditPart extends RoundedCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecAsNestedArtifactNameEditPart.VISUAL_ID));

+		return getChildBySemanticHint(

+				UMLVisualIDRegistry.getType(DeploymentSpecAsNestedArtifactNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsNestedArtifactFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsNestedArtifactFloatingLabelEditPart.java
index e6294ed0d40..f247150964d 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsNestedArtifactFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsNestedArtifactFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -113,22 +113,23 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 

 	/**

 	 * 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.deployment.edit.parts.DeploymentSpecAsNestedArtifactFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(

+				org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentSpecAsNestedArtifactFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -141,7 +142,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -152,7 +152,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

 		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

@@ -165,7 +164,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

@@ -240,7 +238,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -248,7 +245,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -281,8 +277,7 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -294,7 +289,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -310,13 +304,11 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -330,7 +322,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -340,12 +331,15 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeploymentSpecAsNestedArtifactFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														DeploymentSpecAsNestedArtifactFloatingLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -363,7 +357,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -374,7 +367,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -382,10 +374,10 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape_ACN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape_ACN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -445,7 +437,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -473,13 +464,18 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -491,7 +487,8 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -517,9 +514,10 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 				@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);

+						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();

@@ -535,7 +533,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -571,8 +568,7 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	 * @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());

 		}

@@ -589,8 +585,7 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	 * @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());

 		}

@@ -599,15 +594,11 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -615,7 +606,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -623,7 +613,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -639,7 +628,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -653,7 +641,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -676,7 +663,7 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 

 	/**

 	 * 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

 	 */

@@ -695,7 +682,7 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -708,7 +695,7 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -718,42 +705,43 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -762,11 +750,13 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -783,7 +773,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -793,10 +782,10 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 			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())) {

@@ -819,7 +808,6 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -832,4 +820,5 @@ public class DeploymentSpecAsNestedArtifactFloatingLabelEditPart extends Floatin
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsNestedArtifactNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsNestedArtifactNameEditPart.java
index e1c6dfcd04e..afcabb34721 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsNestedArtifactNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsNestedArtifactNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,15 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeploymentSpecAsNestedArtifactNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														DeploymentSpecAsNestedArtifactNameEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +321,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +331,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,10 +338,10 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape_ACN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape_ACN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -411,7 +401,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +428,18 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +451,8 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +478,10 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 				@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);

+						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();

@@ -501,7 +497,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +538,7 @@ public class DeploymentSpecAsNestedArtifactNameEditPart 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());

 		}

@@ -561,8 +555,7 @@ public class DeploymentSpecAsNestedArtifactNameEditPart 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());

 		}

@@ -571,15 +564,11 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +576,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +583,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +598,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +611,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +633,7 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 

 	/**

 	 * 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

 	 */

@@ -667,7 +652,7 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +665,7 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +675,43 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +720,13 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +743,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +751,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +759,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +769,10 @@ public class DeploymentSpecAsNestedArtifactNameEditPart 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())) {

@@ -810,7 +795,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +808,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +824,6 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +837,5 @@ public class DeploymentSpecAsNestedArtifactNameEditPart extends PapyrusCompartme
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsPackageableElEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsPackageableElEditPart.java
index c219525af2d..62b3475b2b2 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsPackageableElEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsPackageableElEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -85,7 +85,6 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -94,7 +93,8 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -148,11 +148,9 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

@@ -161,8 +159,7 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (false == notifier instanceof Edge

-					&& false == notifier instanceof BasicCompartment) {

+			if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

@@ -175,17 +172,14 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new DeploymentSpecificationFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.DeploymentSpecificationFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public DeploymentSpecificationFigure getPrimaryShape() {

 		return (DeploymentSpecificationFigure) primaryShape;

 	}

@@ -199,7 +193,6 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -216,7 +209,6 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -227,7 +219,6 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -238,7 +229,6 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

@@ -249,7 +239,6 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

 		if (borderItemEditPart instanceof DeploymentSpecAsPackageableElFloatingLabelEditPart) {

 			BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH);

@@ -260,7 +249,9 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 		}

 	}

 

-	@Override

+	/**

+	 * @generated

+	 */

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);

 		return result;

@@ -268,13 +259,12 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -283,12 +273,9 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -301,7 +288,6 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -312,7 +298,6 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -322,7 +307,6 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -330,7 +314,6 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -340,8 +323,8 @@ public class DeploymentSpecAsPackageableElEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecAsPackageableElNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsPackageableElFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsPackageableElFloatingLabelEditPart.java
index 84d930cb3d3..94c0319381a 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsPackageableElFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsPackageableElFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -113,22 +113,23 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 

 	/**

 	 * 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.deployment.edit.parts.DeploymentSpecAsPackageableElFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(

+				org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentSpecAsPackageableElFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -141,7 +142,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -152,7 +152,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

 		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

@@ -165,7 +164,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

@@ -240,7 +238,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -248,7 +245,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -281,8 +277,7 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -294,7 +289,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -310,13 +304,11 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -330,7 +322,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -340,12 +331,15 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeploymentSpecAsPackageableElFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														DeploymentSpecAsPackageableElFloatingLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -363,7 +357,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -374,7 +367,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -382,10 +374,10 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -445,7 +437,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -473,13 +464,18 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -491,7 +487,8 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -517,9 +514,10 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 				@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);

+						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();

@@ -535,7 +533,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -571,8 +568,7 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	 * @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());

 		}

@@ -589,8 +585,7 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	 * @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());

 		}

@@ -599,15 +594,11 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -615,7 +606,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -623,7 +613,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -639,7 +628,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -653,7 +641,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -676,7 +663,7 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 

 	/**

 	 * 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

 	 */

@@ -695,7 +682,7 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -708,7 +695,7 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -718,42 +705,43 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -762,11 +750,13 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -783,7 +773,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -793,10 +782,10 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 			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())) {

@@ -819,7 +808,6 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -832,4 +820,5 @@ public class DeploymentSpecAsPackageableElFloatingLabelEditPart extends Floating
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsPackageableElNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsPackageableElNameEditPart.java
index 21965d8ddfc..82dbebb180e 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsPackageableElNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecAsPackageableElNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,15 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeploymentSpecAsPackageableElNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														DeploymentSpecAsPackageableElNameEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +321,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +331,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,10 +338,10 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -411,7 +401,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +428,18 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +451,8 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +478,10 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 				@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);

+						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();

@@ -501,7 +497,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +538,7 @@ public class DeploymentSpecAsPackageableElNameEditPart 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());

 		}

@@ -561,8 +555,7 @@ public class DeploymentSpecAsPackageableElNameEditPart 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());

 		}

@@ -571,15 +564,11 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +576,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +583,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +598,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +611,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +633,7 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * 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

 	 */

@@ -667,7 +652,7 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +665,7 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +675,43 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +720,13 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +743,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +751,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +759,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +769,10 @@ public class DeploymentSpecAsPackageableElNameEditPart 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())) {

@@ -810,7 +795,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +808,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +824,6 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +837,5 @@ public class DeploymentSpecAsPackageableElNameEditPart extends PapyrusCompartmen
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecificationEditPart.java
index 6e4684247e2..ed3daacc82b 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecificationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -84,7 +84,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -93,7 +92,8 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -147,11 +147,9 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

@@ -160,8 +158,7 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

 			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (false == notifier instanceof Edge

-					&& false == notifier instanceof BasicCompartment) {

+			if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) {

 				if (modelChildren.contains(event.getNotifier())) {

 					return;

 				}

@@ -174,17 +171,14 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new DeploymentSpecificationFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.DeploymentSpecificationFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public DeploymentSpecificationFigure getPrimaryShape() {

 		return (DeploymentSpecificationFigure) primaryShape;

 	}

@@ -198,7 +192,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -215,7 +208,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -226,7 +218,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -237,7 +228,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

@@ -248,7 +238,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

 		if (borderItemEditPart instanceof DeploymentSpecificationFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

@@ -258,7 +247,9 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 		}

 	}

 

-	@Override

+	/**

+	 * @generated

+	 */

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);

 		return result;

@@ -266,13 +257,12 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -281,12 +271,9 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -299,7 +286,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -310,7 +296,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -320,7 +305,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -328,7 +312,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -338,8 +321,8 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecificationFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecificationFloatingLabelEditPart.java
index eed3ac807ad..c2da51b76c7 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecificationFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecificationFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -113,22 +113,23 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * 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.deployment.edit.parts.DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(

+				org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -141,7 +142,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -152,7 +152,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

 		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

@@ -165,7 +164,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

@@ -240,7 +238,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -248,7 +245,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -281,8 +277,7 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -294,7 +289,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -310,13 +304,11 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -330,7 +322,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -340,12 +331,15 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeploymentSpecificationFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														DeploymentSpecificationFloatingLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -363,7 +357,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -374,7 +367,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -382,10 +374,10 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -445,7 +437,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -473,13 +464,18 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -491,7 +487,8 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -517,9 +514,10 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 				@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);

+						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();

@@ -535,7 +533,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -571,8 +568,7 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	 * @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());

 		}

@@ -589,8 +585,7 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	 * @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());

 		}

@@ -599,15 +594,11 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -615,7 +606,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -623,7 +613,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -639,7 +628,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -653,7 +641,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -676,7 +663,7 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * 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

 	 */

@@ -695,7 +682,7 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -708,7 +695,7 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -718,42 +705,43 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -762,11 +750,13 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -783,7 +773,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -793,10 +782,10 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 			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())) {

@@ -819,7 +808,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -832,4 +820,5 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecificationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecificationNameEditPart.java
index 18a19a0af78..38d25b42c5a 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecificationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentSpecificationNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * 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

  */

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,16 @@ 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>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeploymentSpecificationNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																DeploymentSpecificationNameEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +322,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +332,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,10 +339,10 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DeploymentSpecification_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -411,7 +402,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +429,18 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +452,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +479,10 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 				@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);

+						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();

@@ -501,7 +498,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +539,7 @@ 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());

 		}

@@ -561,8 +556,7 @@ 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());

 		}

@@ -571,15 +565,11 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +577,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +584,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +599,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +612,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +634,7 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * 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

 	 */

@@ -667,7 +653,7 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +666,7 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +676,43 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +721,13 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +744,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +752,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +760,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +770,10 @@ 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())) {

@@ -810,7 +796,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +809,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +825,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +838,5 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceCompositeCompartmentEditPart.java
index 3625f4881f3..1ac2cc1dd01 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceCompositeCompartmentEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -24,9 +24,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -52,7 +52,6 @@ public class DeviceCompositeCompartmentEditPart extends LinkLFShapeCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.DeviceCompositeCompartmentEditPart_title;

 	}

@@ -60,15 +59,14 @@ public class DeviceCompositeCompartmentEditPart extends LinkLFShapeCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.DeviceCompositeCompartmentCanonicalEditPolicy());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.DeviceCompositeCompartmentCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -77,7 +75,6 @@ public class DeviceCompositeCompartmentEditPart extends LinkLFShapeCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -87,7 +84,6 @@ public class DeviceCompositeCompartmentEditPart extends LinkLFShapeCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -96,7 +92,6 @@ public class DeviceCompositeCompartmentEditPart extends LinkLFShapeCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -118,16 +113,12 @@ public class DeviceCompositeCompartmentEditPart extends LinkLFShapeCompartmentEd
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceCompositeCompartmentEditPartCN.java
index 63bf13752ea..45b7d2769e3 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceCompositeCompartmentEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -25,9 +25,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -53,7 +53,6 @@ public class DeviceCompositeCompartmentEditPartCN extends LinkLFShapeCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.DeviceCompositeCompartmentEditPartCN_title;

 	}

@@ -61,7 +60,6 @@ public class DeviceCompositeCompartmentEditPartCN extends LinkLFShapeCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

@@ -69,8 +67,8 @@ public class DeviceCompositeCompartmentEditPartCN extends LinkLFShapeCompartment
 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.DeviceCompositeCompartmentCanonicalEditPolicyCN());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.DeviceCompositeCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -79,7 +77,6 @@ public class DeviceCompositeCompartmentEditPartCN extends LinkLFShapeCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -89,7 +86,6 @@ public class DeviceCompositeCompartmentEditPartCN extends LinkLFShapeCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -98,7 +94,6 @@ public class DeviceCompositeCompartmentEditPartCN extends LinkLFShapeCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -120,16 +115,12 @@ public class DeviceCompositeCompartmentEditPartCN extends LinkLFShapeCompartment
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPart.java
index 89dd91a472a..f44fce423bb 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -74,7 +74,6 @@ public class DeviceEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -84,9 +83,12 @@ public class DeviceEditPart extends NamedElementEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -123,11 +125,9 @@ public class DeviceEditPart extends NamedElementEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -136,17 +136,14 @@ public class DeviceEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new DeviceFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.DeviceFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public DeviceFigure getPrimaryShape() {

 		return (DeviceFigure) primaryShape;

 	}

@@ -160,10 +157,9 @@ public class DeviceEditPart extends NamedElementEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof DeviceCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((DeviceCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

@@ -189,7 +185,6 @@ public class DeviceEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -200,7 +195,6 @@ public class DeviceEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -211,7 +205,6 @@ public class DeviceEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof DeviceCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

@@ -222,7 +215,6 @@ public class DeviceEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 100);

 		return result;

@@ -230,13 +222,12 @@ public class DeviceEditPart extends NamedElementEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -245,12 +236,9 @@ public class DeviceEditPart extends NamedElementEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -263,7 +251,6 @@ public class DeviceEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -274,7 +261,6 @@ public class DeviceEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -284,7 +270,6 @@ public class DeviceEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -292,7 +277,6 @@ public class DeviceEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -302,8 +286,8 @@ public class DeviceEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPartCN.java
index 62f2550e0e1..cb83341fdc5 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -74,7 +74,6 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -84,9 +83,12 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -123,11 +125,9 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -136,17 +136,14 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new DeviceFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.DeviceFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public DeviceFigure getPrimaryShape() {

 		return (DeviceFigure) primaryShape;

 	}

@@ -160,7 +157,6 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -177,7 +173,6 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -188,7 +183,6 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -199,7 +193,6 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

@@ -207,7 +200,6 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 100);

 		return result;

@@ -215,13 +207,12 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -230,12 +221,9 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -248,7 +236,6 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -259,7 +246,6 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -269,7 +255,6 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -277,7 +262,6 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -287,8 +271,8 @@ public class DeviceEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceNameEditPartCN.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceNameEditPart.java
index b3693bcf16c..93dc19dd0ed 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeviceNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), DeviceNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Device_Shape, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class DeviceNameEditPart 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());

 		}

@@ -561,8 +552,7 @@ public class DeviceNameEditPart 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());

 		}

@@ -571,15 +561,11 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class DeviceNameEditPart 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())) {

@@ -810,7 +792,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class DeviceNameEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceNameEditPartCN.java
index af33834525d..4b04610448c 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceNameEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeviceNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), DeviceNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Device_Shape_CCN, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class DeviceNameEditPartCN 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());

 		}

@@ -561,8 +552,7 @@ public class DeviceNameEditPartCN 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());

 		}

@@ -571,15 +561,11 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class DeviceNameEditPartCN 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())) {

@@ -810,7 +792,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class DeviceNameEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
index c8437f3a31a..ad21c7664ac 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -24,9 +24,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -52,7 +52,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart extends LinkLFShap
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.ExecutionEnvironmentCompositeCompartmentEditPart_title;

 	}

@@ -60,15 +59,14 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart extends LinkLFShap
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicy());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -77,7 +75,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart extends LinkLFShap
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -87,7 +84,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart extends LinkLFShap
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -96,7 +92,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart extends LinkLFShap
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -118,16 +113,12 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart extends LinkLFShap
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
index 74cbe644e7a..d1fef42ee28 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -25,9 +25,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -53,7 +53,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends LinkLFSh
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.ExecutionEnvironmentCompositeCompartmentEditPartCN_title;

 	}

@@ -61,7 +60,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends LinkLFSh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

@@ -69,8 +67,8 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends LinkLFSh
 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicyCN());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -79,7 +77,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends LinkLFSh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -89,7 +86,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends LinkLFSh
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -98,7 +94,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends LinkLFSh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -120,16 +115,12 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends LinkLFSh
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPart.java
index 26ed7b19a85..124ac5b3816 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -74,7 +74,6 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -84,9 +83,12 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -123,11 +125,9 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -136,17 +136,14 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ExecutionEnvironmentFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.ExecutionEnvironmentFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ExecutionEnvironmentFigure getPrimaryShape() {

 		return (ExecutionEnvironmentFigure) primaryShape;

 	}

@@ -160,10 +157,9 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((ExecutionEnvironmentCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

@@ -189,7 +185,6 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -200,7 +195,6 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -211,7 +205,6 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

@@ -222,7 +215,6 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 100);

 		return result;

@@ -230,13 +222,12 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -245,12 +236,9 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -263,7 +251,6 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -274,7 +261,6 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -284,7 +270,6 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -292,7 +277,6 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -302,8 +286,8 @@ public class ExecutionEnvironmentEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPartCN.java
index 471249748ae..138a296d65a 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -74,7 +74,6 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -84,9 +83,12 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -123,11 +125,9 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -136,17 +136,14 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ExecutionEnvironmentFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.ExecutionEnvironmentFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ExecutionEnvironmentFigure getPrimaryShape() {

 		return (ExecutionEnvironmentFigure) primaryShape;

 	}

@@ -160,7 +157,6 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -177,7 +173,6 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -188,7 +183,6 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -199,7 +193,6 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

@@ -207,7 +200,6 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 100);

 		return result;

@@ -215,13 +207,12 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -230,12 +221,9 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -248,7 +236,6 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -259,7 +246,6 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -269,7 +255,6 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -277,7 +262,6 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -287,8 +271,8 @@ public class ExecutionEnvironmentEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentNameEditPartCN.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentNameEditPart.java
index 21902748cd0..7b9cd1e10a7 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,16 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ExecutionEnvironmentNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ExecutionEnvironmentNameEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +322,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +332,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,10 +339,10 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.ExecutionEnvironment_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.ExecutionEnvironment_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -411,7 +402,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +429,18 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +452,8 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +479,10 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +498,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +539,7 @@ public class ExecutionEnvironmentNameEditPart 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());

 		}

@@ -561,8 +556,7 @@ public class ExecutionEnvironmentNameEditPart 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());

 		}

@@ -571,15 +565,11 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +577,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +584,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +599,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +612,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +634,7 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +653,7 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +666,7 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +676,43 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +721,13 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +744,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +752,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +760,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +770,10 @@ public class ExecutionEnvironmentNameEditPart 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())) {

@@ -810,7 +796,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +809,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +825,6 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +838,5 @@ public class ExecutionEnvironmentNameEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentNameEditPartCN.java
index 3c97d4876ee..d41edc08de7 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentNameEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,16 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ExecutionEnvironmentNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ExecutionEnvironmentNameEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +322,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +332,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,10 +339,10 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.ExecutionEnvironment_Shape_CCN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.ExecutionEnvironment_Shape_CCN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -411,7 +402,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +429,18 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +452,8 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +479,10 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 				@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);

+						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();

@@ -501,7 +498,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +539,7 @@ public class ExecutionEnvironmentNameEditPartCN 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());

 		}

@@ -561,8 +556,7 @@ public class ExecutionEnvironmentNameEditPartCN 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());

 		}

@@ -571,15 +565,11 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +577,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +584,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +599,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +612,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +634,7 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 

 	/**

 	 * 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

 	 */

@@ -667,7 +653,7 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +666,7 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +676,43 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +721,13 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +744,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +752,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +760,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +770,10 @@ public class ExecutionEnvironmentNameEditPartCN 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())) {

@@ -810,7 +796,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +809,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +825,6 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +838,5 @@ public class ExecutionEnvironmentNameEditPartCN extends PapyrusCompartmentEditPa
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/GeneralizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/GeneralizationAppliedStereotypeEditPart.java
index fb23eaca383..f7d01c6fecd 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/GeneralizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/GeneralizationAppliedStereotypeEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -112,22 +112,23 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 	/**

 	 * 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.deployment.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(

+				org.eclipse.papyrus.uml.diagram.deployment.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -138,7 +139,7 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

@@ -151,7 +152,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -222,7 +222,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -230,7 +229,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -238,7 +236,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -264,8 +261,7 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -277,7 +273,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -293,13 +288,11 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -313,7 +306,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -323,12 +315,16 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), GeneralizationAppliedStereotypeEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																GeneralizationAppliedStereotypeEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -346,7 +342,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -357,7 +352,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,7 +359,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Generalization_Edge, getParserElement(), this, VISUAL_ID);

@@ -428,7 +421,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -456,13 +448,18 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -474,7 +471,8 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -500,9 +498,10 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 				@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);

+						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();

@@ -518,7 +517,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -554,8 +552,7 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 * @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());

 		}

@@ -572,8 +569,7 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 * @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());

 		}

@@ -582,15 +578,11 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -598,7 +590,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,7 +597,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -622,7 +612,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -636,7 +625,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -659,7 +647,7 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 	/**

 	 * 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

 	 */

@@ -670,7 +658,7 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -683,7 +671,7 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -693,42 +681,43 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -737,11 +726,13 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -758,7 +749,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -768,10 +758,10 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 			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())) {

@@ -795,7 +785,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -804,7 +793,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getLabelRole() {

 		return "Stereotype";//$NON-NLS-1$

 	}

@@ -812,7 +800,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getIconPathRole() {

 		return "";//$NON-NLS-1$

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/GeneralizationEditPart.java
index 6ceee79e527..ef018078b8c 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/GeneralizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/GeneralizationEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -18,14 +18,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure;

 

 /**

- * @generated

- */

+	 * @generated

+	 */

 public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

@@ -43,11 +42,11 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

 	}

 

@@ -56,8 +55,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;

 	}

@@ -65,7 +64,6 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -86,7 +84,6 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -96,13 +93,12 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new GeneralizationFigure();

 	}

@@ -110,8 +106,8 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public GeneralizationFigure getPrimaryShape() {

 		return (GeneralizationFigure) getFigure();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/LinkDescriptorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/LinkDescriptorEditPart.java
index 5b62f15a603..57c7e149d1a 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/LinkDescriptorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/LinkDescriptorEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -21,8 +21,8 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
 import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

 

 /**

- * @generated

- */

+	 * @generated

+	 */

 public class LinkDescriptorEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

@@ -40,7 +40,6 @@ public class LinkDescriptorEditPart extends ConnectionEditPart implements ITreeB
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());

@@ -49,13 +48,12 @@ public class LinkDescriptorEditPart extends ConnectionEditPart implements ITreeB
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new SimpleDashedEdgeFigure();

 	}

@@ -63,8 +61,8 @@ public class LinkDescriptorEditPart extends ConnectionEditPart implements ITreeB
 	/**

 	 * @generated

 	 */

-	@Override

 	public SimpleDashedEdgeFigure getPrimaryShape() {

 		return (SimpleDashedEdgeFigure) getFigure();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationAppliedStereotypeEditPart.java
index a3e29a54fd0..84f4ed0c77d 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationAppliedStereotypeEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -112,22 +112,23 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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.deployment.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(

+				org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

 	}

 

 	/**

@@ -138,7 +139,7 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

@@ -151,7 +152,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -222,7 +222,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -230,7 +229,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -238,7 +236,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -264,8 +261,7 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -277,7 +273,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -293,13 +288,11 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -313,7 +306,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -323,12 +315,16 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ManifestationAppliedStereotypeEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ManifestationAppliedStereotypeEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -346,7 +342,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -357,7 +352,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,7 +359,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Manifestation_Edge, getParserElement(), this, VISUAL_ID);

@@ -428,7 +421,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -456,13 +448,18 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -474,7 +471,8 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -500,9 +498,10 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 				@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);

+						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();

@@ -518,7 +517,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -554,8 +552,7 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -572,8 +569,7 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -582,15 +578,11 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -598,7 +590,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,7 +597,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -622,7 +612,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -636,7 +625,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -659,7 +647,7 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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

 	 */

@@ -678,7 +666,7 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -691,7 +679,7 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,42 +689,43 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -745,11 +734,13 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -766,7 +757,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -776,10 +766,10 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 			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())) {

@@ -803,7 +793,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -812,7 +801,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getLabelRole() {

 		return "Stereotype";//$NON-NLS-1$

 	}

@@ -820,7 +808,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getIconPathRole() {

 		return "";//$NON-NLS-1$

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationEditPart.java
index 8485a61a557..47a732c0432 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -18,14 +18,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

- * @generated

- */

+	 * @generated

+	 */

 public class ManifestationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

@@ -43,11 +42,11 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

 	}

 

@@ -56,12 +55,11 @@ 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;

 	}

@@ -69,7 +67,6 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -93,7 +90,6 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -103,13 +99,12 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new DashedEdgeFigure();

 	}

@@ -117,8 +112,8 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public DashedEdgeFigure getPrimaryShape() {

 		return (DashedEdgeFigure) getFigure();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationNameEditPart.java
index 09907ebfdea..9e4cead5ebd 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -112,22 +112,24 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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.deployment.edit.parts.ManifestationNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ManifestationNameEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -138,7 +140,7 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

@@ -151,7 +153,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -222,7 +223,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -230,7 +230,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -238,7 +237,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -264,8 +262,7 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -277,7 +274,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -293,13 +289,11 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -313,7 +307,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -323,12 +316,13 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ManifestationNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ManifestationNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -346,7 +340,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -357,7 +350,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,7 +357,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Manifestation_Edge, getParserElement(), this, VISUAL_ID);

@@ -428,7 +419,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -456,13 +446,18 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -474,7 +469,8 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -500,9 +496,10 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 				@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);

+						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();

@@ -518,7 +515,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -554,8 +550,7 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -572,8 +567,7 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -582,15 +576,11 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -598,7 +588,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,7 +595,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -622,7 +610,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -636,7 +623,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -659,7 +645,7 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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

 	 */

@@ -678,7 +664,7 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -691,7 +677,7 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,42 +687,43 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -745,11 +732,13 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -766,7 +755,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -776,10 +764,10 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 			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())) {

@@ -803,7 +791,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -812,7 +799,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getLabelRole() {

 		return "Name";//$NON-NLS-1$

 	}

@@ -820,7 +806,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getIconPathRole() {

 		return "";//$NON-NLS-1$

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPart.java
index 27169e503e6..23ca4909b00 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -71,7 +71,6 @@ public class ModelEditPart extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -79,8 +78,10 @@ public class ModelEditPart extends PackageEditPart {
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -117,11 +118,9 @@ public class ModelEditPart extends PackageEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -130,17 +129,14 @@ public class ModelEditPart extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new PackageFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public PackageFigure getPrimaryShape() {

 		return (PackageFigure) primaryShape;

 	}

@@ -154,10 +150,9 @@ public class ModelEditPart extends PackageEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ModelPackageableElementCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getPackageableElementFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((ModelPackageableElementCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

@@ -183,7 +178,6 @@ public class ModelEditPart extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -194,7 +188,6 @@ public class ModelEditPart extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -205,7 +198,6 @@ public class ModelEditPart extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof ModelPackageableElementCompartmentEditPart) {

 			return getPrimaryShape().getPackageableElementFigure();

@@ -216,7 +208,6 @@ public class ModelEditPart extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);

 		return result;

@@ -224,13 +215,12 @@ public class ModelEditPart extends PackageEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -239,12 +229,9 @@ public class ModelEditPart extends PackageEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -257,7 +244,6 @@ public class ModelEditPart extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -268,7 +254,6 @@ public class ModelEditPart extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -278,7 +263,6 @@ public class ModelEditPart extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -286,7 +270,6 @@ public class ModelEditPart extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -296,8 +279,8 @@ public class ModelEditPart extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ModelNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPartCN.java
index cfa502991e8..7ca8ca049ef 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -71,7 +71,6 @@ public class ModelEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -79,8 +78,10 @@ public class ModelEditPartCN extends PackageEditPart {
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -117,11 +118,9 @@ public class ModelEditPartCN extends PackageEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -130,17 +129,14 @@ public class ModelEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new PackageFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public PackageFigure getPrimaryShape() {

 		return (PackageFigure) primaryShape;

 	}

@@ -154,10 +150,9 @@ public class ModelEditPartCN extends PackageEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ModelPackageableElementCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getPackageableElementFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((ModelPackageableElementCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

@@ -183,7 +178,6 @@ public class ModelEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -194,7 +188,6 @@ public class ModelEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -205,7 +198,6 @@ public class ModelEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof ModelPackageableElementCompartmentEditPartCN) {

 			return getPrimaryShape().getPackageableElementFigure();

@@ -216,7 +208,6 @@ public class ModelEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);

 		return result;

@@ -224,13 +215,12 @@ public class ModelEditPartCN extends PackageEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -239,12 +229,9 @@ public class ModelEditPartCN extends PackageEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -257,7 +244,6 @@ public class ModelEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -268,7 +254,6 @@ public class ModelEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -278,7 +263,6 @@ public class ModelEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -286,7 +270,6 @@ public class ModelEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -296,8 +279,8 @@ public class ModelEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ModelNameEditPartCN.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelNameEditPart.java
index aa5b934eb2d..243f22ebe14 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -42,7 +42,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -64,9 +63,11 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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.deployment.edit.policies.UMLTextSelectionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

@@ -112,14 +113,12 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -134,7 +133,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -208,7 +206,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -216,7 +213,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -224,7 +220,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,7 +239,7 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 		if (parserElement == null) {

 			return null;

 		}

-		List<View> views = org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

 		for (View view : views) {

 			if (AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

@@ -260,8 +255,7 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -273,7 +267,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -289,13 +282,11 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -309,7 +300,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -319,12 +309,14 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ModelNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(), ModelNameEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -342,7 +334,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -353,7 +344,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -361,7 +351,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Model_Shape, getParserElement(), this, VISUAL_ID);

@@ -424,7 +413,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -452,13 +440,18 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -470,7 +463,8 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -496,9 +490,10 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -514,7 +509,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -556,8 +550,7 @@ public class ModelNameEditPart 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());

 		}

@@ -574,8 +567,7 @@ public class ModelNameEditPart 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());

 		}

@@ -584,15 +576,11 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -600,7 +588,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -608,7 +595,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -624,7 +610,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -638,7 +623,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -661,7 +645,7 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -680,7 +664,7 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -693,7 +677,7 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,42 +687,43 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -747,11 +732,13 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -768,7 +755,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -777,7 +763,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -786,7 +771,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -797,10 +781,10 @@ public class ModelNameEditPart 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())) {

@@ -817,7 +801,8 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -826,7 +811,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -840,7 +824,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -857,7 +840,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -871,4 +853,5 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelNameEditPartCN.java
index 7a55c40b8f4..3a065b4763f 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelNameEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -42,7 +42,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -64,9 +63,11 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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.deployment.edit.policies.UMLTextSelectionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

@@ -112,14 +113,12 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -134,7 +133,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -208,7 +206,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -216,7 +213,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -224,7 +220,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,7 +239,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 		if (parserElement == null) {

 			return null;

 		}

-		List<View> views = org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

 		for (View view : views) {

 			if (AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

@@ -260,8 +255,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -273,7 +267,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -289,13 +282,11 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -309,7 +300,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -319,12 +309,13 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ModelNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ModelNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -342,7 +333,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -353,7 +343,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -361,7 +350,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Model_Shape_CN, getParserElement(), this, VISUAL_ID);

@@ -424,7 +412,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -452,13 +439,18 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -470,7 +462,8 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -496,9 +489,10 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -514,7 +508,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -556,8 +549,7 @@ public class ModelNameEditPartCN 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());

 		}

@@ -574,8 +566,7 @@ public class ModelNameEditPartCN 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());

 		}

@@ -584,15 +575,11 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -600,7 +587,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -608,7 +594,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -624,7 +609,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -638,7 +622,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -661,7 +644,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -680,7 +663,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -693,7 +676,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,42 +686,43 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -747,11 +731,13 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -768,7 +754,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -777,7 +762,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -786,7 +770,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -797,10 +780,10 @@ public class ModelNameEditPartCN 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())) {

@@ -817,7 +800,8 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -826,7 +810,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -840,7 +823,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -857,7 +839,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -871,4 +852,5 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelPackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelPackageableElementCompartmentEditPart.java
index 272c43d2ae5..03754ba17da 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelPackageableElementCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelPackageableElementCompartmentEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -24,10 +24,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -53,7 +53,6 @@ public class ModelPackageableElementCompartmentEditPart extends LinkLFShapeCompa
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.ModelPackageableElementCompartmentEditPart_title;

 	}

@@ -61,15 +60,14 @@ public class ModelPackageableElementCompartmentEditPart extends LinkLFShapeCompa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicy());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -79,7 +77,6 @@ public class ModelPackageableElementCompartmentEditPart extends LinkLFShapeCompa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -89,7 +86,6 @@ public class ModelPackageableElementCompartmentEditPart extends LinkLFShapeCompa
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -98,7 +94,6 @@ public class ModelPackageableElementCompartmentEditPart extends LinkLFShapeCompa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -120,16 +115,12 @@ public class ModelPackageableElementCompartmentEditPart extends LinkLFShapeCompa
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelPackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
index cc9b322d829..37412373a1b 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -24,10 +24,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -53,7 +53,6 @@ public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCom
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.ModelPackageableElementCompartmentEditPartCN_title;

 	}

@@ -61,15 +60,14 @@ public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCom
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyCN());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -79,7 +77,6 @@ public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCom
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -89,7 +86,6 @@ public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCom
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -98,7 +94,6 @@ public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCom
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -120,16 +115,12 @@ public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCom
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/MultiDependencyLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/MultiDependencyLabelEditPart.java
index b4c27c901ef..869433009ff 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/MultiDependencyLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/MultiDependencyLabelEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -112,22 +112,24 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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.deployment.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.deployment.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -140,7 +142,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -151,7 +152,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

 		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

@@ -164,7 +164,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

@@ -239,7 +238,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -247,7 +245,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -280,8 +277,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -293,7 +289,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -309,13 +304,11 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -329,7 +322,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -339,12 +331,14 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), MultiDependencyLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														MultiDependencyLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -362,7 +356,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -373,7 +366,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -381,7 +373,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Dependency_Shape, getParserElement(), this, VISUAL_ID);

@@ -444,7 +435,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -472,13 +462,18 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -490,7 +485,8 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -516,9 +512,10 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 				@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);

+						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();

@@ -534,7 +531,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -570,8 +566,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -588,8 +583,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	 * @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());

 		}

@@ -598,15 +592,11 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -614,7 +604,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -622,7 +611,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -638,7 +626,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -652,7 +639,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -675,7 +661,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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

 	 */

@@ -694,7 +680,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -707,7 +693,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -717,42 +703,43 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -761,11 +748,13 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -782,7 +771,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

 		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

@@ -792,10 +780,10 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 			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())) {

@@ -818,7 +806,6 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -831,4 +818,5 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new WrappingLabel();

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNameEditPart.java
index 933ae50c4f9..a96ffa3c625 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedArtifactNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), NestedArtifactNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Artifact_Shape_CN, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class NestedArtifactNameEditPart 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());

 		}

@@ -561,8 +552,7 @@ public class NestedArtifactNameEditPart 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());

 		}

@@ -571,15 +561,11 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class NestedArtifactNameEditPart 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())) {

@@ -810,7 +792,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class NestedArtifactNameEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNodeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNodeEditPartCN.java
index 642113e7403..9c6e14a72bd 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNodeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNodeEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -73,7 +73,6 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -82,10 +81,13 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -121,11 +123,9 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -134,17 +134,14 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ArtifactFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.ArtifactFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ArtifactFigure getPrimaryShape() {

 		return (ArtifactFigure) primaryShape;

 	}

@@ -158,7 +155,6 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -175,7 +171,6 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -186,7 +181,6 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -197,7 +191,6 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

@@ -205,7 +198,6 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);

 		return result;

@@ -213,13 +205,12 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -228,12 +219,9 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -246,7 +234,6 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -257,7 +244,6 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -267,7 +253,6 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -275,7 +260,6 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -285,8 +269,8 @@ public class NestedArtifactNodeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NestedArtifactNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceEditPartCN.java
index 63bad2e4d55..74f92bdd10f 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -73,7 +73,6 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -83,9 +82,12 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -124,17 +126,14 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new DeviceFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.DeviceFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public DeviceFigure getPrimaryShape() {

 		return (DeviceFigure) primaryShape;

 	}

@@ -148,10 +147,9 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof DeviceCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((DeviceCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

@@ -177,7 +175,6 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -188,7 +185,6 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -199,7 +195,6 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof DeviceCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

@@ -210,7 +205,6 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 100);

 		return result;

@@ -218,13 +212,12 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -233,12 +226,9 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -251,7 +241,6 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -262,7 +251,6 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -272,7 +260,6 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -280,7 +267,6 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -290,8 +276,8 @@ public class NestedDeviceEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NestedDeviceNameEditPartCN.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceNameEditPartCN.java
index d58882d852a..38c6ddef9eb 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceNameEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedDeviceNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), NestedDeviceNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Device_Shape_CN, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class NestedDeviceNameEditPartCN 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());

 		}

@@ -561,8 +552,7 @@ public class NestedDeviceNameEditPartCN 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());

 		}

@@ -571,15 +561,11 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class NestedDeviceNameEditPartCN 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())) {

@@ -810,7 +792,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class NestedDeviceNameEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentEditPartCN.java
index eaed31ebd55..a0e4971b3e7 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -73,7 +73,6 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -83,9 +82,12 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -124,17 +126,14 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ExecutionEnvironmentFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.ExecutionEnvironmentFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ExecutionEnvironmentFigure getPrimaryShape() {

 		return (ExecutionEnvironmentFigure) primaryShape;

 	}

@@ -148,10 +147,9 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((ExecutionEnvironmentCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

@@ -177,7 +175,6 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -188,7 +185,6 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -199,7 +195,6 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

@@ -210,7 +205,6 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 100);

 		return result;

@@ -218,13 +212,12 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -233,12 +226,9 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -251,7 +241,6 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -262,7 +251,6 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -272,7 +260,6 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -280,7 +267,6 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -290,8 +276,8 @@ public class NestedExecutionEnvironmentEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NestedExecutionEnvironmentNameEditPartCN.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentNameEditPartCN.java
index 28e7324eaed..02e14947e78 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentNameEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,15 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedExecutionEnvironmentNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														NestedExecutionEnvironmentNameEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +321,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +331,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,10 +338,10 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.ExecutionEnvironment_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.ExecutionEnvironment_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -411,7 +401,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +428,18 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +451,8 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +478,10 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 				@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);

+						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();

@@ -501,7 +497,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +538,7 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	 * @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());

 		}

@@ -561,8 +555,7 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	 * @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());

 		}

@@ -571,15 +564,11 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +576,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +583,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +598,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +611,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +633,7 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 

 	/**

 	 * 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

 	 */

@@ -667,7 +652,7 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +665,7 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +675,43 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +720,13 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +743,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +751,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +759,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +769,10 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 			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())) {

@@ -810,7 +795,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +808,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +824,6 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +837,5 @@ public class NestedExecutionEnvironmentNameEditPartCN extends PapyrusCompartment
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeEditPartCN.java
index d21dc5108d8..bc3cb62a546 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -72,7 +72,6 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -82,9 +81,12 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -123,17 +125,14 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new NodeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.NodeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public NodeFigure getPrimaryShape() {

 		return (NodeFigure) primaryShape;

 	}

@@ -147,10 +146,9 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof NodeCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((NodeCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

@@ -176,7 +174,6 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -187,7 +184,6 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -198,7 +194,6 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof NodeCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

@@ -209,7 +204,6 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);

 		return result;

@@ -217,13 +211,12 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -232,12 +225,9 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -250,7 +240,6 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -261,7 +250,6 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -271,7 +259,6 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -279,7 +266,6 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -289,8 +275,8 @@ public class NestedNodeEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NestedNodeNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeNameEditPart.java
index 2c0fe2eb25f..3e33038e32e 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedNodeNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), NestedNodeNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Node_Shape_CN, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class NestedNodeNameEditPart 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());

 		}

@@ -561,8 +552,7 @@ public class NestedNodeNameEditPart 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());

 		}

@@ -571,15 +561,11 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class NestedNodeNameEditPart 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())) {

@@ -810,7 +792,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class NestedNodeNameEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeCompositeCompartmentEditPart.java
index 23e04bb62eb..645beee2e9a 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeCompositeCompartmentEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -24,9 +24,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -52,7 +52,6 @@ public class NodeCompositeCompartmentEditPart extends LinkLFShapeCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.NodeCompositeCompartmentEditPart_title;

 	}

@@ -60,15 +59,14 @@ public class NodeCompositeCompartmentEditPart extends LinkLFShapeCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.NodeCompositeCompartmentCanonicalEditPolicy());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.NodeCompositeCompartmentCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -77,7 +75,6 @@ public class NodeCompositeCompartmentEditPart extends LinkLFShapeCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -87,7 +84,6 @@ public class NodeCompositeCompartmentEditPart extends LinkLFShapeCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -96,7 +92,6 @@ public class NodeCompositeCompartmentEditPart extends LinkLFShapeCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -118,16 +113,12 @@ public class NodeCompositeCompartmentEditPart extends LinkLFShapeCompartmentEdit
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeCompositeCompartmentEditPartCN.java
index 708233bc031..5216d0bb05f 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeCompositeCompartmentEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -25,9 +25,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -53,7 +53,6 @@ public class NodeCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.NodeCompositeCompartmentEditPartCN_title;

 	}

@@ -61,7 +60,6 @@ public class NodeCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

@@ -69,8 +67,8 @@ public class NodeCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEd
 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.NodeCompositeCompartmentCanonicalEditPolicyCN());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.NodeCompositeCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -79,7 +77,6 @@ public class NodeCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -89,7 +86,6 @@ public class NodeCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -98,7 +94,6 @@ public class NodeCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -120,16 +115,12 @@ public class NodeCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEd
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPart.java
index 038af798646..dcd125b84e1 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -73,7 +73,6 @@ public class NodeEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -83,9 +82,12 @@ public class NodeEditPart extends NamedElementEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -122,11 +124,9 @@ public class NodeEditPart extends NamedElementEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -135,17 +135,14 @@ public class NodeEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new NodeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.NodeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public NodeFigure getPrimaryShape() {

 		return (NodeFigure) primaryShape;

 	}

@@ -159,10 +156,9 @@ public class NodeEditPart extends NamedElementEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof NodeCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((NodeCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

@@ -188,7 +184,6 @@ public class NodeEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -199,7 +194,6 @@ public class NodeEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -210,7 +204,6 @@ public class NodeEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof NodeCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

@@ -221,7 +214,6 @@ public class NodeEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);

 		return result;

@@ -229,13 +221,12 @@ public class NodeEditPart extends NamedElementEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -244,12 +235,9 @@ public class NodeEditPart extends NamedElementEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -262,7 +250,6 @@ public class NodeEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -273,7 +260,6 @@ public class NodeEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -283,7 +269,6 @@ public class NodeEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -291,7 +276,6 @@ public class NodeEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -301,8 +285,8 @@ public class NodeEditPart extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NodeNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java
index 92c306edc3b..9caed8a4879 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -73,7 +73,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -83,9 +82,12 @@ public class NodeEditPartCN extends NamedElementEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -122,11 +124,9 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -135,17 +135,14 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new NodeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.NodeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public NodeFigure getPrimaryShape() {

 		return (NodeFigure) primaryShape;

 	}

@@ -159,7 +156,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -176,7 +172,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -187,7 +182,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -198,7 +192,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

@@ -206,7 +199,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);

 		return result;

@@ -214,13 +206,12 @@ public class NodeEditPartCN extends NamedElementEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -229,12 +220,9 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -247,7 +235,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -258,7 +245,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -268,7 +254,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -276,7 +261,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -286,8 +270,8 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NodeNameEditPartCN.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeNameEditPart.java
index b172327a10d..78106ccd0ab 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,14 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NodeNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(), NodeNameEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +320,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +330,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +337,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Node_Shape, getParserElement(), this, VISUAL_ID);

@@ -411,7 +399,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +426,18 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +449,8 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +476,10 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +495,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +536,7 @@ public class NodeNameEditPart 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());

 		}

@@ -561,8 +553,7 @@ public class NodeNameEditPart 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());

 		}

@@ -571,15 +562,11 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +574,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +581,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +596,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +609,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +631,7 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +650,7 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +663,7 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +673,43 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +718,13 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +741,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +749,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +757,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +767,10 @@ public class NodeNameEditPart 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())) {

@@ -810,7 +793,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +806,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +822,6 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +835,5 @@ public class NodeNameEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeNameEditPartCN.java
index e5d95ddf971..0622e8ef737 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeNameEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -41,7 +41,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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;

@@ -109,14 +109,12 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -131,7 +129,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -205,7 +202,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -213,7 +209,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -221,7 +216,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -247,8 +241,7 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -260,7 +253,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -276,13 +268,11 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -296,7 +286,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -306,12 +295,13 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NodeNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), NodeNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -329,7 +319,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -340,7 +329,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -348,7 +336,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Node_Shape_CCN, getParserElement(), this, VISUAL_ID);

@@ -411,7 +398,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -439,13 +425,18 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -457,7 +448,8 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -483,9 +475,10 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -501,7 +494,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,8 +535,7 @@ public class NodeNameEditPartCN 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());

 		}

@@ -561,8 +552,7 @@ public class NodeNameEditPartCN 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());

 		}

@@ -571,15 +561,11 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -587,7 +573,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -595,7 +580,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -611,7 +595,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -625,7 +608,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -648,7 +630,7 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -667,7 +649,7 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -680,7 +662,7 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -690,42 +672,43 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -734,11 +717,13 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -755,7 +740,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -764,7 +748,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -773,7 +756,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -784,10 +766,10 @@ public class NodeNameEditPartCN 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())) {

@@ -810,7 +792,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -824,7 +805,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -841,7 +821,6 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -855,4 +834,5 @@ public class NodeNameEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPart.java
index 677b745293d..bbc3415a9c0 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -70,7 +70,6 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -78,8 +77,10 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -116,11 +117,9 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -129,17 +128,14 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new PackageFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public PackageFigure getPrimaryShape() {

 		return (PackageFigure) primaryShape;

 	}

@@ -153,10 +149,9 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 			return true;

 		}

 

-

 		if (childEditPart instanceof PackagePackageableElementCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getPackageableElementFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((PackagePackageableElementCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

@@ -182,7 +177,6 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -193,7 +187,6 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -204,7 +197,6 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof PackagePackageableElementCompartmentEditPart) {

 			return getPrimaryShape().getPackageableElementFigure();

@@ -215,7 +207,6 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);

 		return result;

@@ -223,13 +214,12 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -238,12 +228,9 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -256,7 +243,6 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -267,7 +253,6 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -277,7 +262,6 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -285,7 +269,6 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -295,8 +278,8 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageNameEditPart.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPartCN.java
index 57e3dbc1fff..95ca415d5f8 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -71,7 +71,6 @@ public class PackageEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -79,8 +78,10 @@ public class PackageEditPartCN extends PackageEditPart {
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -117,11 +118,9 @@ public class PackageEditPartCN extends PackageEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -130,17 +129,14 @@ public class PackageEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new PackageFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public PackageFigure getPrimaryShape() {

 		return (PackageFigure) primaryShape;

 	}

@@ -154,10 +150,9 @@ public class PackageEditPartCN extends PackageEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof PackagePackageableElementCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getPackageableElementFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((PackagePackageableElementCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

@@ -183,7 +178,6 @@ public class PackageEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -194,7 +188,6 @@ public class PackageEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -205,7 +198,6 @@ public class PackageEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof PackagePackageableElementCompartmentEditPartCN) {

 			return getPrimaryShape().getPackageableElementFigure();

@@ -216,7 +208,6 @@ public class PackageEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);

 		return result;

@@ -224,13 +215,12 @@ public class PackageEditPartCN extends PackageEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -239,12 +229,9 @@ public class PackageEditPartCN extends PackageEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -257,7 +244,6 @@ public class PackageEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -268,7 +254,6 @@ public class PackageEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -278,7 +263,6 @@ public class PackageEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -286,7 +270,6 @@ public class PackageEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -296,8 +279,8 @@ public class PackageEditPartCN extends PackageEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageNameEditPartCN.VISUAL_ID));

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageNameEditPart.java
index b599430af50..38b54cbfe14 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageNameEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -42,7 +42,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -64,9 +63,11 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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.deployment.edit.policies.UMLTextSelectionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

@@ -112,14 +113,12 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -134,7 +133,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -208,7 +206,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -216,7 +213,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -224,7 +220,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,7 +239,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 		if (parserElement == null) {

 			return null;

 		}

-		List<View> views = org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

 		for (View view : views) {

 			if (AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

@@ -260,8 +255,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -273,7 +267,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -289,13 +282,11 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -309,7 +300,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -319,12 +309,13 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PackageNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), PackageNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -342,7 +333,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -353,7 +343,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -361,7 +350,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Package_Shape, getParserElement(), this, VISUAL_ID);

@@ -424,7 +412,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -452,13 +439,18 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -470,7 +462,8 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -496,9 +489,10 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -514,7 +508,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -556,8 +549,7 @@ public class PackageNameEditPart 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());

 		}

@@ -574,8 +566,7 @@ public class PackageNameEditPart 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());

 		}

@@ -584,15 +575,11 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -600,7 +587,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -608,7 +594,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -624,7 +609,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -638,7 +622,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -661,7 +644,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -680,7 +663,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -693,7 +676,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,42 +686,43 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -747,11 +731,13 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -768,7 +754,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -777,7 +762,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -786,7 +770,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -797,10 +780,10 @@ public class PackageNameEditPart 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())) {

@@ -817,7 +800,8 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -826,7 +810,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -840,7 +823,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -857,7 +839,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -871,4 +852,5 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageNameEditPartCN.java
index 79c1c04b792..25f0625e00e 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageNameEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -42,7 +42,6 @@ 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.DefaultNodeLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -64,9 +63,11 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditP
 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.parsers.ParserUtil;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

 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.deployment.edit.policies.UMLTextSelectionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

@@ -112,14 +113,12 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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;

@@ -134,7 +133,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -208,7 +206,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -216,7 +213,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -224,7 +220,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,7 +239,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 		if (parserElement == null) {

 			return null;

 		}

-		List<View> views = org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

 		for (View view : views) {

 			if (AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

@@ -260,8 +255,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					ParserUtil.getParserAdapter(getParserElement(), this),

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

 					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

@@ -273,7 +267,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

@@ -289,13 +282,11 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				ParserUtil.getParserAdapter(getParserElement(), this),

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

 				getParserOptions().intValue());

 	}

 

@@ -309,7 +300,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

@@ -319,12 +309,13 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PackageNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), PackageNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -342,7 +333,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

 		if (getParserElement() == null || getParser() == null) {

 			return null;

@@ -353,7 +343,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -361,7 +350,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

 		if (parser == null) {

 			parser = ParserUtil.getParser(UMLElementTypes.Package_Shape_CN, getParserElement(), this, VISUAL_ID);

@@ -424,7 +412,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

 

 		final Request theRequest = request;

@@ -452,13 +439,18 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 					initializeDirectEditManager(theRequest);

 					return;

 				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+					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()));

+					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;

 				}

@@ -470,7 +462,8 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -496,9 +489,10 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

+						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();

@@ -514,7 +508,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -556,8 +549,7 @@ public class PackageNameEditPartCN 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());

 		}

@@ -574,8 +566,7 @@ public class PackageNameEditPartCN 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());

 		}

@@ -584,15 +575,11 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@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);

 		}

 	}

@@ -600,7 +587,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -608,7 +594,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

 		if (getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

@@ -624,7 +609,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

 		if (parserElements != null) {

 			for (int i = 0; i < parserElements.size(); i++) {

@@ -638,7 +622,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

 		if (accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

@@ -661,7 +644,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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

 	 */

@@ -680,7 +663,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

@@ -693,7 +676,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,42 +686,43 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * 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());

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

 			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE,

+						resolveSemanticElement(), this);

 			}

 		}

 	}

 

 	/**

 	 * 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(), this);

+		if (languagePreferred != null && !languagePreferred.equals("")

+				&& !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+					this);

 		} 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

-	 */

+	* 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 {

@@ -747,11 +731,13 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 				@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);

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

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

@@ -768,7 +754,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -777,7 +762,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -786,7 +770,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

@@ -797,10 +780,10 @@ public class PackageNameEditPartCN 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())) {

@@ -817,7 +800,8 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -826,7 +810,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -840,7 +823,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -857,7 +839,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

@@ -871,4 +852,5 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter(ADD_PARENT_MODEL);

 

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackagePackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackagePackageableElementCompartmentEditPart.java
index ea0cc899ba4..79a87018e8e 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackagePackageableElementCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackagePackageableElementCompartmentEditPart.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -24,10 +24,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -53,7 +53,6 @@ public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCom
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.PackagePackageableElementCompartmentEditPart_title;

 	}

@@ -61,15 +60,14 @@ public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCom
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicy());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -79,7 +77,6 @@ public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCom
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -89,7 +86,6 @@ public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCom
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -98,7 +94,6 @@ public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCom
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -120,16 +115,12 @@ public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCom
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackagePackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
index 98d075d583c..dac4b62dfc6 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -24,10 +24,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -53,7 +53,6 @@ public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeC
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getCompartmentName() {

 		return Messages.PackagePackageableElementCompartmentEditPartCN_title;

 	}

@@ -61,15 +60,14 @@ public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeC
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-		// in Papyrus diagrams are not strongly synchronised

-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicyCN());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.deployment.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -79,7 +77,6 @@ public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeC
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setRatio(Double ratio) {

 		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

 			super.setRatio(ratio);

@@ -89,7 +86,6 @@ public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeC
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

 

 		return super.getTargetEditPart(request);

@@ -98,7 +94,6 @@ public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeC
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

 		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

@@ -120,16 +115,12 @@ public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeC
 		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));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshBounds();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/UMLEditPartFactory.java
index eb912d759f2..0c3368cc716 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/UMLEditPartFactory.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.parts;

 

@@ -18,8 +18,8 @@ import org.eclipse.gef.EditPartFactory;
 import org.eclipse.gef.tools.CellEditorLocator;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.directedit.locator.CellEditorLocatorAccess;

 import org.eclipse.jface.viewers.CellEditor;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator.CellEditorLocatorAccess;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry;

 import org.eclipse.swt.SWT;

@@ -33,7 +33,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart createEditPart(EditPart context, Object model) {

 		if (model instanceof View) {

 			View view = (View) model;

@@ -273,15 +272,12 @@ public class UMLEditPartFactory implements EditPartFactory {
 			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 DeploymentEditPart.VISUAL_ID:

 				return new DeploymentEditPart(view);

 

@@ -291,7 +287,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case DeploymentAppliedStereotypeEditPart.VISUAL_ID:

 				return new DeploymentAppliedStereotypeEditPart(view);

 

-

 			case ManifestationEditPart.VISUAL_ID:

 				return new ManifestationEditPart(view);

 

@@ -301,14 +296,12 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case ManifestationAppliedStereotypeEditPart.VISUAL_ID:

 				return new ManifestationAppliedStereotypeEditPart(view);

 

-

 			case GeneralizationEditPart.VISUAL_ID:

 				return new GeneralizationEditPart(view);

 

 			case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new GeneralizationAppliedStereotypeEditPart(view);

 

-

 			case DependencyEditPart.VISUAL_ID:

 				return new DependencyEditPart(view);

 

@@ -318,11 +311,9 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case DependencyAppliedStereotypeEditPart.VISUAL_ID:

 				return new DependencyAppliedStereotypeEditPart(view);

 

-

 			case DependencyBranchEditPart.VISUAL_ID:

 				return new DependencyBranchEditPart(view);

 

-

 			case CommunicationPathEditPart.VISUAL_ID:

 				return new CommunicationPathEditPart(view);

 

@@ -350,8 +341,7 @@ public class UMLEditPartFactory implements EditPartFactory {
 	 */

 	public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {

 		if (source.getFigure() instanceof IMultilineEditableFigure) {

-			return new MultilineCellEditorLocator(

-					(IMultilineEditableFigure) source.getFigure());

+			return new MultilineCellEditorLocator((IMultilineEditableFigure) source.getFigure());

 		} else {

 			return CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source);

 

@@ -385,7 +375,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 		/**

 		 * @generated

 		 */

-		@Override

 		public void relocate(CellEditor celleditor) {

 			Text text = (Text) celleditor.getControl();

 			Rectangle rect = getMultilineEditableFigure().getBounds().getCopy();

@@ -393,12 +382,12 @@ 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.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLBaseItemSemanticEditPolicy.java
index caf3a71ee09..dfe4e6cf4b4 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.policies;

 

@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.helpers.GeneratedEditHelperBase;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

@@ -71,18 +71,14 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 

 	/**

 	 * Extended request data key to hold editpart visual id.

-	 *

 	 * @generated

 	 */

 	public static final String VISUAL_ID_KEY = "visual_id"; //$NON-NLS-1$

-

 	/**

 	 * Extended request data key to hold the edge view during a reconnect request.

-	 *

 	 * @generated

 	 */

 	public static final String GRAPHICAL_RECONNECTED_EDGE = "graphical_edge"; //$NON-NLS-1$

-

 	/**

 	 * @generated

 	 */

@@ -102,12 +98,11 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 * It is done in those cases when it's not possible to deduce diagram

 	 * element kind from domain element.

 	 * Add the reoriented view to the request extended data so that the view

-	 * currently edited can be distinguished from other views of the same element

-	 * and these latter possibly removed if they become inconsistent after reconnect

-	 *

+	 *  currently edited can be distinguished from other views of the same element

+	 *  and these latter possibly removed if they become inconsistent after reconnect

+	 * 

 	 * @generated

 	 */

-	@Override

 	@SuppressWarnings("unchecked")

 	public Command getCommand(Request request) {

 		if (request instanceof ReconnectRequest) {

@@ -123,7 +118,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 

 	/**

 	 * Returns visual id from request parameters.

-	 *

 	 * @generated

 	 */

 	protected String getVisualID(IEditCommandRequest request) {

@@ -133,7 +127,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected Command getSemanticCommand(IEditCommandRequest request) {

 		IEditCommandRequest completedRequest = completeRequest(request);

 		Command semanticCommand = getSemanticCommandSwitch(completedRequest);

@@ -158,7 +151,9 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 */

 	private Command getEditHelperCommand(IEditCommandRequest request, Command editPolicyCommand) {

 		if (editPolicyCommand != null) {

-			ICommand command = editPolicyCommand instanceof ICommandProxy ? ((ICommandProxy) editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand);

+			ICommand command = editPolicyCommand instanceof ICommandProxy

+					? ((ICommandProxy) editPolicyCommand).getICommand()

+					: new CommandProxy(editPolicyCommand);

 			request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, command);

 		}

 		IElementType requestContextElementType = getContextElementType(request);

@@ -244,7 +239,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		return null;

 	}

 

-	// RS: End of add code for extended types

 	/**

 	 * @generated

 	 */

@@ -323,7 +317,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 

 	/**

 	 * Returns editing domain from the host edit part.

-	 *

 	 * @generated

 	 */

 	protected TransactionalEditingDomain getEditingDomain() {

@@ -332,14 +325,14 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 

 	/**

 	 * Clean all shortcuts to the host element from the same diagram

-	 *

 	 * @generated

 	 */

 	protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view) {

 		assert view.getEAnnotation("Shortcut") == null; //$NON-NLS-1$

 		for (Iterator<?> it = view.getDiagram().getChildren().iterator(); it.hasNext();) {

 			View nextView = (View) it.next();

-			if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$

+			if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() //$NON-NLS-1$

+					|| nextView.getElement() != view.getElement()) {

 				continue;

 			}

 			cmd.add(new DeleteCommand(getEditingDomain(), nextView));

@@ -380,14 +373,12 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		 */

 		public boolean canCreateComment_AnnotatedElementEdge(Comment source, Element target) {

 			if (source != null) {

-				if (source.getAnnotatedElements()

-						.contains(target)) {

+				if (source.getAnnotatedElements().contains(target)) {

 					return false;

 				}

 			}

 

-			return canExistComment_AnnotatedElementEdge(

-					source, target);

+			return canExistComment_AnnotatedElementEdge(source, target);

 		}

 

 		/**

@@ -395,62 +386,54 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		 */

 		public boolean canCreateConstraint_ConstrainedElementEdge(Constraint source, Element target) {

 			if (source != null) {

-				if (source.getConstrainedElements()

-						.contains(target)) {

+				if (source.getConstrainedElements().contains(target)) {

 					return false;

 				}

 			}

 

-			return canExistConstraint_ConstrainedElementEdge(

-					source, target);

+			return canExistConstraint_ConstrainedElementEdge(source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateDeployment_Edge(DeploymentTarget container, NamedElement source, NamedElement target) {

-			return canExistDeployment_Edge(

-					container, null, source, target);

+			return canExistDeployment_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateManifestation_Edge(Artifact container, NamedElement source, NamedElement target) {

-			return canExistManifestation_Edge(

-					container, null, source, target);

+			return canExistManifestation_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateGeneralization_Edge(Classifier container, Classifier source, Classifier target) {

-			return canExistGeneralization_Edge(

-					container, null, source, target);

+			return canExistGeneralization_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateDependency_Edge(Package container, NamedElement source, NamedElement target) {

-			return canExistDependency_Edge(

-					container, null, source, target);

+			return canExistDependency_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateDependency_BranchEdge(Package container, NamedElement source, NamedElement target) {

-			return canExistDependency_BranchEdge(

-					container, null, source, target);

+			return canExistDependency_BranchEdge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateCommunicationPath_Edge(Package container, Type source, Type target) {

-			return canExistCommunicationPath_Edge(

-					container, null, source, target);

+			return canExistCommunicationPath_Edge(container, null, source, target);

 		}

 

 		/**

@@ -522,4 +505,5 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 			return true;

 		}

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLTextNonResizableEditPolicy.java
index 9b4e9172eb8..cc9024a9a7b 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLTextNonResizableEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLTextNonResizableEditPolicy.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.policies;

 

@@ -27,7 +27,7 @@ import org.eclipse.gef.handles.MoveHandle;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableEditPolicyEx;

 import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy;

 

 /**

  * @generated

@@ -52,7 +52,6 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void showPrimarySelection() {

 		if (getHostFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getHostFigure()).setSelected(true);

@@ -66,7 +65,6 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void showSelection() {

 		if (getHostFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getHostFigure()).setSelected(true);

@@ -83,7 +81,6 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void hideSelection() {

 		if (getHostFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getHostFigure()).setSelected(false);

@@ -101,7 +98,6 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void showFocus() {

 		if (getHostFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getHostFigure()).setFocus(true);

@@ -115,7 +111,6 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void hideFocus() {

 		if (getHostFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getHostFigure()).setFocus(false);

@@ -233,11 +228,11 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> createSelectionHandles() {

 		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.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLTextSelectionEditPolicy.java
index f33b8ff9e16..1e02c37a0bb 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLTextSelectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLTextSelectionEditPolicy.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.edit.policies;

 

@@ -21,7 +21,7 @@ import org.eclipse.draw2d.RectangleFigure;
 import org.eclipse.draw2d.geometry.Rectangle;

 import org.eclipse.gef.editpolicies.SelectionEditPolicy;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy;

 

 /**

  * @generated

@@ -46,7 +46,6 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void showPrimarySelection() {

 		if (getHostFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getHostFigure()).setSelected(true);

@@ -60,7 +59,6 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void showSelection() {

 		if (getHostFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getHostFigure()).setSelected(true);

@@ -77,7 +75,6 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void hideSelection() {

 		if (getHostFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getHostFigure()).setSelected(false);

@@ -95,7 +92,6 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void showFocus() {

 		if (getHostFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getHostFigure()).setFocus(true);

@@ -109,7 +105,6 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void hideFocus() {

 		if (getHostFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getHostFigure()).setFocus(false);

@@ -223,4 +218,5 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 		}

 		return hostPositionListener;

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/expressions/UMLAbstractExpression.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/expressions/UMLAbstractExpression.java
index 6613ba57157..782b10e54f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/expressions/UMLAbstractExpression.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/expressions/UMLAbstractExpression.java
@@ -42,7 +42,8 @@ public abstract class UMLAbstractExpression {
 		String pluginID = UMLDiagramEditorPlugin.ID;

 		this.status = new Status(severity, pluginID, -1, (message != null) ? message : "", throwable); //$NON-NLS-1$

 		if (!this.status.isOK()) {

-			UMLDiagramEditorPlugin.getInstance().logError("Expression problem:" + message + "body:" + body(), throwable); //$NON-NLS-1$ //$NON-NLS-2$

+			UMLDiagramEditorPlugin.getInstance().logError("Expression problem:" + message + "body:" + body(), //$NON-NLS-1$//$NON-NLS-2$

+					throwable);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/expressions/UMLOCLFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/expressions/UMLOCLFactory.java
index d5d4e01bc51..7df87cf53e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/expressions/UMLOCLFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/expressions/UMLOCLFactory.java
@@ -48,8 +48,7 @@ public class UMLOCLFactory {
 	 */

 	protected UMLOCLFactory() {

 		this.expressions = new UMLAbstractExpression[3];

-		this.expressionBodies = new String[] {

-				"self.name.concat(\'.file\') ", //$NON-NLS-1$

+		this.expressionBodies = new String[] { "self.name.concat(\'.file\') ", //$NON-NLS-1$

 				"self.oclIsKindOf(DeploymentTarget)", //$NON-NLS-1$

 				"not self.oclIsKindOf(DeploymentSpecification)", //$NON-NLS-1$

 		};

@@ -83,7 +82,8 @@ public class UMLOCLFactory {
 			throw new IllegalArgumentException();

 		}

 		if (cached.expressions[index] == null) {

-			cached.expressions[index] = getExpression(cached.expressionBodies[index], context, environment == null ? Collections.<String, EClassifier> emptyMap() : environment);

+			cached.expressions[index] = getExpression(cached.expressionBodies[index], context,

+					environment == null ? Collections.<String, EClassifier>emptyMap() : environment);

 		}

 		return cached.expressions[index];

 	}

@@ -104,7 +104,7 @@ public class UMLOCLFactory {
 	 * @generated

 	 */

 	public static UMLAbstractExpression getExpression(String body, EClassifier context) {

-		return getExpression(body, context, Collections.<String, EClassifier> emptyMap());

+		return getExpression(body, context, Collections.<String, EClassifier>emptyMap());

 	}

 

 	/**

@@ -166,9 +166,11 @@ public class UMLOCLFactory {
 		/**

 		 * @generated

 		 */

-		private static void initCustomEnv(Environment<?, EClassifier, ?, ?, ?, EParameter, ?, ?, ?, ?, ?, ?> ecoreEnv, Map<String, EClassifier> environment) {

+		private static void initCustomEnv(Environment<?, EClassifier, ?, ?, ?, EParameter, ?, ?, ?, ?, ?, ?> ecoreEnv,

+				Map<String, EClassifier> environment) {

 			// Use EObject as implicit root class for any object, to allow eContainer() and other EObject operations from OCL expressions

-			ParsingOptions.setOption(ecoreEnv, ParsingOptions.implicitRootClass(ecoreEnv), EcorePackage.eINSTANCE.getEObject());

+			ParsingOptions.setOption(ecoreEnv, ParsingOptions.implicitRootClass(ecoreEnv),

+					EcorePackage.eINSTANCE.getEObject());

 			for (String varName : environment.keySet()) {

 				EClassifier varType = environment.get(varName);

 				ecoreEnv.addElement(varName, createVar(ecoreEnv, varName, varType), false);

@@ -178,7 +180,8 @@ public class UMLOCLFactory {
 		/**

 		 * @generated

 		 */

-		private static Variable createVar(Environment<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?> ecoreEnv, String name, EClassifier type) {

+		private static Variable createVar(Environment<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?> ecoreEnv,

+				String name, EClassifier type) {

 			Variable var = EcoreFactory.eINSTANCE.createVariable();

 			var.setName(name);

 			var.setType(ecoreEnv.getUMLReflection().getOCLType(type));

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/parsers/AbstractParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/parsers/AbstractParser.java
index a625f09edb5..0cb00c061a7 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/parsers/AbstractParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/parsers/AbstractParser.java
@@ -1 +1 @@
-// Since GMFT 3.1 we don't generate class AbstractParser into every diagram, instead extend org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser.

+//Since GMFT 3.1 we don't generate class AbstractParser into every diagram, instead extend org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers.AbstractAttributeParser.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/parsers/MessageFormatParser.java
index 81155e942cb..7d52dd20f3f 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/parsers/MessageFormatParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/parsers/MessageFormatParser.java
@@ -1,260 +1,255 @@
-/**
- * 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
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- */
-package org.eclipse.papyrus.uml.diagram.deployment.parsers;
-
-import java.text.FieldPosition;
-import java.text.MessageFormat;
-import java.text.ParsePosition;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
-import org.eclipse.papyrus.uml.diagram.deployment.part.Messages;
-import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class MessageFormatParser extends AbstractAttributeParser {
-
-	/**
-	 * @generated
-	 */
-	private String defaultPattern;
-
-	/**
-	 * @generated
-	 */
-	private String defaultEditablePattern;
-
-	/**
-	 * @generated
-	 */
-	private MessageFormat viewProcessor;
-
-	/**
-	 * @generated
-	 */
-	private MessageFormat editorProcessor;
-
-	/**
-	 * @generated
-	 */
-	private MessageFormat editProcessor;
-
-	/**
-	 * @generated
-	 */
-	public MessageFormatParser(EAttribute[] features) {
-		super(features);
-	}
-
-	/**
-	 * @generated
-	 */
-	public MessageFormatParser(EAttribute[] features, EAttribute[] editableFeatures) {
-		super(features, editableFeatures);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultPattern() {
-		if (defaultPattern == null) {
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < features.length; i++) {
-				if (i > 0) {
-					sb.append(' ');
-				}
-				sb.append('{');
-				sb.append(i);
-				sb.append('}');
-			}
-			defaultPattern = sb.toString();
-		}
-		return defaultPattern;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setViewPattern(String viewPattern) {
-		super.setViewPattern(viewPattern);
-		viewProcessor = null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setEditorPattern(String editorPattern) {
-		super.setEditorPattern(editorPattern);
-		editorProcessor = null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MessageFormat getViewProcessor() {
-		if (viewProcessor == null) {
-			viewProcessor = new MessageFormat(getViewPattern() == null ? getDefaultPattern() : getViewPattern());
-		}
-		return viewProcessor;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MessageFormat getEditorProcessor() {
-		if (editorProcessor == null) {
-			editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());
-		}
-		return editorProcessor;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultEditablePattern() {
-		if (defaultEditablePattern == null) {
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < editableFeatures.length; i++) {
-				if (i > 0) {
-					sb.append(' ');
-				}
-				sb.append('{');
-				sb.append(i);
-				sb.append('}');
-			}
-			defaultEditablePattern = sb.toString();
-		}
-		return defaultEditablePattern;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setEditPattern(String editPattern) {
-		super.setEditPattern(editPattern);
-		editProcessor = null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MessageFormat getEditProcessor() {
-		if (editProcessor == null) {
-			editProcessor = new MessageFormat(getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern());
-		}
-		return editProcessor;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditString(IAdaptable adapter, int flags) {
-		EObject element = adapter.getAdapter(EObject.class);
-		return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0)).toString();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParserEditStatus isValidEditString(IAdaptable adapter, String editString) {
-		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 validateNewValues(values);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {
-		Object[] values = getEditProcessor().parse(newString, new ParsePosition(0));
-		return getParseCommand(adapter, values, flags);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getPrintString(IAdaptable adapter, int flags) {
-		EObject element = adapter.getAdapter(EObject.class);
-		return getViewProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.gmf.tooling.runtime.parsers.AbstractFeatureParser#getModificationCommand(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)
-	 */
-	@Override
-	protected ICommand getModificationCommand(final EObject element, final EStructuralFeature feature, final Object value) {
-		ICommand result = null;
-
-		// If the feature to edit is the name, check that this is not really the internationalization to edit and not the name
-		if (feature.equals(UMLPackage.eINSTANCE.getNamedElement_Name())) {
-			if (InternationalizationPreferencesUtils.getInternationalizationPreference(element) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement) element)) {
-				final ModelSet modelSet = (ModelSet) element.eResource().getResourceSet();
-				if (null != modelSet) {
-					result = new EMFtoGMFCommandWrapper(UMLLabelInternationalization.getInstance().getSetLabelCommand(modelSet.getTransactionalEditingDomain(), (NamedElement) element, (String) value, null));
-				}
-			}
-		}
-
-		return null != result ? result : super.getModificationCommand(element, feature, value);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser#getValue(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	@Override
-	protected Object getValue(final EObject element, final EStructuralFeature feature) {
-		Object result = null;
-		
-		if(element instanceof NamedElement && feature.equals(UMLPackage.eINSTANCE.getNamedElement_Name())){
-			if (InternationalizationPreferencesUtils.getInternationalizationPreference(element) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement)element)) {
-				result = UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement)element);
-			}
-		}
-		
-		return null != result ? result : super.getValue(element, feature);
-	}
-}
+/**

+ * 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.deployment.parsers;

+

+import java.text.FieldPosition;

+import java.text.MessageFormat;

+import java.text.ParsePosition;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.infra.core.resource.ModelSet;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers.AbstractAttributeParser;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers.AbstractFeatureParser;

+import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;

+import org.eclipse.papyrus.uml.diagram.deployment.part.Messages;

+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class MessageFormatParser extends AbstractAttributeParser {

+

+	/**

+	 * @generated

+	 */

+	private String defaultPattern;

+	/**

+	 * @generated

+	 */

+	private String defaultEditablePattern;

+

+	/**

+	 * @generated

+	 */

+	private MessageFormat viewProcessor;

+

+	/**

+	 * @generated

+	 */

+	private MessageFormat editorProcessor;

+

+	/**

+	 * @generated

+	 */

+	private MessageFormat editProcessor;

+

+	/**

+	 * @generated

+	 */

+	public MessageFormatParser(EAttribute[] features) {

+		super(features);

+	}

+

+	/**

+	 * @generated

+	 */

+	public MessageFormatParser(EAttribute[] features, EAttribute[] editableFeatures) {

+		super(features, editableFeatures);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getDefaultPattern() {

+		if (defaultPattern == null) {

+			StringBuffer sb = new StringBuffer();

+			for (int i = 0; i < features.length; i++) {

+				if (i > 0) {

+					sb.append(' ');

+				}

+				sb.append('{');

+				sb.append(i);

+				sb.append('}');

+			}

+			defaultPattern = sb.toString();

+		}

+		return defaultPattern;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setViewPattern(String viewPattern) {

+		super.setViewPattern(viewPattern);

+		viewProcessor = null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setEditorPattern(String editorPattern) {

+		super.setEditorPattern(editorPattern);

+		editorProcessor = null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MessageFormat getViewProcessor() {

+		if (viewProcessor == null) {

+			viewProcessor = new MessageFormat(getViewPattern() == null ? getDefaultPattern() : getViewPattern());

+		}

+		return viewProcessor;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MessageFormat getEditorProcessor() {

+		if (editorProcessor == null) {

+			editorProcessor = new MessageFormat(

+					getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());

+		}

+		return editorProcessor;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getDefaultEditablePattern() {

+		if (defaultEditablePattern == null) {

+			StringBuffer sb = new StringBuffer();

+			for (int i = 0; i < editableFeatures.length; i++) {

+				if (i > 0) {

+					sb.append(' ');

+				}

+				sb.append('{');

+				sb.append(i);

+				sb.append('}');

+			}

+			defaultEditablePattern = sb.toString();

+		}

+		return defaultEditablePattern;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setEditPattern(String editPattern) {

+		super.setEditPattern(editPattern);

+		editProcessor = null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MessageFormat getEditProcessor() {

+		if (editProcessor == null) {

+			editProcessor = new MessageFormat(

+					getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern());

+		}

+		return editProcessor;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditString(IAdaptable adapter, int flags) {

+		EObject element = (EObject) adapter.getAdapter(EObject.class);

+		return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0))

+				.toString();

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParserEditStatus isValidEditString(IAdaptable adapter, String editString) {

+		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 validateNewValues(values);

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {

+		Object[] values = getEditProcessor().parse(newString, new ParsePosition(0));

+		return getParseCommand(adapter, values, flags);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getPrintString(IAdaptable adapter, int flags) {

+		EObject element = (EObject) adapter.getAdapter(EObject.class);

+		return getViewProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString();

+	}

+

+	/**

+	 * @generated

+	 * {@inheritDoc}

+	 * @see AbstractFeatureParser#getModificationCommand(EObject, EStructuralFeature, java.lang.Object)

+	 */

+	@Override

+	protected ICommand getModificationCommand(final EObject element, final EStructuralFeature feature,

+			final Object value) {

+		ICommand result = null;

+

+		// If the feature to edit is the name, check that this is not really the internationalization to edit and not the name

+		if (feature.equals(UMLPackage.eINSTANCE.getNamedElement_Name())) {

+			if (InternationalizationPreferencesUtils.getInternationalizationPreference(element)

+					&& null != UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement) element)) {

+				final ModelSet modelSet = (ModelSet) element.eResource().getResourceSet();

+				if (null != modelSet) {

+					result = new EMFtoGMFCommandWrapper(UMLLabelInternationalization.getInstance().getSetLabelCommand(

+							modelSet.getTransactionalEditingDomain(), (NamedElement) element, (String) value, null));

+				}

+			}

+		}

+

+		return null != result ? result : super.getModificationCommand(element, feature, value);

+	}

+

+	/**

+	 * @generated

+	 * {@inheritDoc}

+	 * @see AbstractAttributeParser#getValue(EObject, EStructuralFeature)

+	 */

+	@Override

+	protected Object getValue(final EObject element, final EStructuralFeature feature) {

+		Object result = null;

+

+		if (element instanceof NamedElement && feature.equals(UMLPackage.eINSTANCE.getNamedElement_Name())) {

+			if (InternationalizationPreferencesUtils.getInternationalizationPreference(element)

+					&& null != UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement) element)) {

+				result = UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement) element);

+			}

+		}

+

+		return null != result ? result : super.getValue(element, feature);

+	}	

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/DiagramEditorContextMenuProvider.java
index 6dbc7c75f08..952af179f4d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/DiagramEditorContextMenuProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/DiagramEditorContextMenuProvider.java
@@ -45,13 +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.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/LoadResourceAction.java
index 27aecbdd9eb..fd4eec34231 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/LoadResourceAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/LoadResourceAction.java
@@ -1,30 +1,29 @@
 /**

  * 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

+  * 

+  * 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.deployment.part;

 

 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.gmf.tooling.runtime.actions.DefaultLoadResourceAction;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.actions.DefaultLoadResourceAction;

 

 /**

  * @generated

  */

 public class LoadResourceAction extends DefaultLoadResourceAction {

-

 	/**

 	 * @generated

 	 */

-	@Override

 	public Object execute(ExecutionEvent event) throws ExecutionException {

 		return super.execute(event);

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/ModelElementSelectionPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/ModelElementSelectionPage.java
index ceb88b2ccfb..1d7233094af 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/ModelElementSelectionPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/ModelElementSelectionPage.java
@@ -1,21 +1,20 @@
 /**

  * 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

+  * 

+  * 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.deployment.part;

 

-import org.eclipse.gmf.tooling.runtime.part.DefaultModelElementSelectionPage;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.part.DefaultModelElementSelectionPage;

 

 /**

  * Wizard page that allows to select element from model.

- *

  * @generated

  */

 public class ModelElementSelectionPage extends DefaultModelElementSelectionPage {

@@ -29,11 +28,10 @@ public class ModelElementSelectionPage extends DefaultModelElementSelectionPage
 

 	/**

 	 * Override to provide custom model element description.

-	 *

 	 * @generated

 	 */

-	@Override

 	protected String getSelectionTitle() {

 		return Messages.ModelElementSelectionPageMessage;

 	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLCreationWizard.java
index 881b97fa658..e193ec9da6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLCreationWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLCreationWizard.java
@@ -103,8 +103,8 @@ public class UMLCreationWizard extends Wizard implements INewWizard {
 		this.workbench = workbench;

 		this.selection = selection;

 		setWindowTitle(Messages.UMLCreationWizardTitle);

-		setDefaultPageImageDescriptor(UMLDiagramEditorPlugin.getBundledImageDescriptor(

-				"icons/wizban/NewUMLWizard.gif")); //$NON-NLS-1$

+		setDefaultPageImageDescriptor(

+				UMLDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewUMLWizard.gif")); //$NON-NLS-1$

 		setNeedsProgressMonitor(true);

 	}

 

@@ -113,22 +113,21 @@ public class UMLCreationWizard extends Wizard implements INewWizard {
 	 */

 	@Override

 	public void addPages() {

-		diagramModelFilePage = new UMLCreationWizardPage(

-				"DiagramModelFile", getSelection(), "PapyrusUMLDeployment_diagram"); //$NON-NLS-1$ //$NON-NLS-2$

+		diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), //$NON-NLS-1$

+				"PapyrusUMLDeployment_diagram"); //$NON-NLS-1$

 		diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle);

 		diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription);

 		addPage(diagramModelFilePage);

 

-		domainModelFilePage = new UMLCreationWizardPage(

-				"DomainModelFile", getSelection(), "umlDeployment") { //$NON-NLS-1$ //$NON-NLS-2$

+		domainModelFilePage = new UMLCreationWizardPage("DomainModelFile", getSelection(), "umlDeployment") { //$NON-NLS-1$ //$NON-NLS-2$

 

 			@Override

 			public void setVisible(boolean visible) {

 				if (visible) {

 					String fileName = diagramModelFilePage.getFileName();

 					fileName = fileName.substring(0, fileName.length() - ".PapyrusUMLDeployment_diagram".length()); //$NON-NLS-1$

-					setFileName(UMLDiagramEditorUtil.getUniqueFileName(

-							getContainerFullPath(), fileName, "umlDeployment")); //$NON-NLS-1$

+					setFileName(

+							UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), fileName, "umlDeployment")); //$NON-NLS-1$

 				}

 				super.setVisible(visible);

 			}

@@ -146,17 +145,15 @@ public class UMLCreationWizard extends Wizard implements INewWizard {
 		IRunnableWithProgress op = new WorkspaceModifyOperation(null) {

 

 			@Override

-			protected void execute(IProgressMonitor monitor)

-					throws CoreException, InterruptedException {

+			protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException {

 				diagram = UMLDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(),

-						domainModelFilePage.getURI(),

-						monitor);

+						domainModelFilePage.getURI(), monitor);

 				if (isOpenNewlyCreatedDiagramEditor() && diagram != null) {

 					try {

 						UMLDiagramEditorUtil.openDiagram(diagram);

 					} catch (PartInitException e) {

-						ErrorDialog.openError(getContainer().getShell(),

-								Messages.UMLCreationWizardOpenEditorError, null, e.getStatus());

+						ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardOpenEditorError,

+								null, e.getStatus());

 					}

 				}

 			}

@@ -167,12 +164,10 @@ public class UMLCreationWizard extends Wizard implements INewWizard {
 			return false;

 		} catch (InvocationTargetException e) {

 			if (e.getTargetException() instanceof CoreException) {

-				ErrorDialog.openError(getContainer().getShell(),

-						Messages.UMLCreationWizardCreationError, null,

+				ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardCreationError, null,

 						((CoreException) e.getTargetException()).getStatus());

 			} else {

-				UMLDiagramEditorPlugin.getInstance().logError(

-						"Error creating diagram", e.getTargetException()); //$NON-NLS-1$

+				UMLDiagramEditorPlugin.getInstance().logError("Error creating diagram", e.getTargetException()); //$NON-NLS-1$

 			}

 			return false;

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLCreationWizardPage.java
index 923815d0069..97eb3d7d08a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLCreationWizardPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLCreationWizardPage.java
@@ -74,8 +74,7 @@ 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());

 	}

 

@@ -89,8 +88,7 @@ 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.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditor.java
index 9f0ec33a73b..8deec5ea32e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditor.java
@@ -51,6 +51,7 @@ import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.MouseEvent;

 import org.eclipse.swt.events.MouseListener;

 import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Display;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IWorkbenchPart;

@@ -225,7 +226,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());

 	}

@@ -249,7 +251,17 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 

 			@Override

 			public void commandStackChanged(EventObject event) {

-				firePropertyChange(IEditorPart.PROP_DIRTY);

+				if (Display.getCurrent() == null) {

+					Display.getDefault().asyncExec(new Runnable() {

+

+						@Override

+						public void run() {

+							firePropertyChange(IEditorPart.PROP_DIRTY);

+						}

+					});

+				} else {

+					firePropertyChange(IEditorPart.PROP_DIRTY);

+				}

 			}

 		});

 	}

@@ -394,7 +406,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 						 * whenever a key is released, and the Tool is in the proper state. Override

 						 * to support pressing the enter key to create a shape or connection

 						 * (between two selected shapes)

-						 *

+						 * 

 						 * @param event

 						 *            the KeyEvent

 						 * @return <code>true</code> if KeyEvent was handled in some way

@@ -444,7 +456,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 						/**

 						 * Override to support double-clicking a palette tool entry to create a

 						 * shape or connection (between two selected shapes).

-						 *

+						 * 

 						 * @see MouseListener#mouseDoubleClick(MouseEvent)

 						 */

 						@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditorPlugin.java
index 2844646b14f..3a40c5299f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditorPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditorPlugin.java
@@ -96,7 +96,8 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 		instance = this;

 		myLogHelper = new LogHelper(this);

 		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());

-		adapterFactory = org.eclipse.papyrus.infra.gmfdiag.common.Activator.getInstance().getItemProvidersAdapterFactory();

+		adapterFactory = org.eclipse.papyrus.infra.gmfdiag.common.Activator.getInstance()

+				.getItemProvidersAdapterFactory();

 		DiagramPreferenceInitializer diagramPreferenceInitializer = new DiagramPreferenceInitializer();

 		diagramPreferenceInitializer.initializeDefaultPreferences();

 

@@ -142,11 +143,9 @@ 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;

 	}

@@ -177,8 +176,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());

 		}

@@ -208,8 +207,7 @@ 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.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditorUtil.java
index 7479062602f..663bdf2fe59 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditorUtil.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.part;

 

@@ -51,10 +51,10 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
 import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.part.DefaultDiagramEditorUtil;

 import org.eclipse.jface.dialogs.IDialogSettings;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.jface.wizard.WizardDialog;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.part.DefaultDiagramEditorUtil;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IWorkbenchPage;

@@ -73,7 +73,7 @@ public class UMLDiagramEditorUtil {
 	 * @generated

 	 */

 	public static Map<?, ?> getSaveOptions() {

-		HashMap<String, Object> saveOptions = new HashMap<>();

+		HashMap<String, Object> saveOptions = new HashMap<String, Object>();

 		saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$

 		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

 		return saveOptions;

@@ -116,7 +116,7 @@ public class UMLDiagramEditorUtil {
 

 	/**

 	 * Runs the wizard in a dialog.

-	 *

+	 * 

 	 * @generated

 	 */

 	public static void runWizard(Shell shell, Wizard wizard, String settingsKey) {

@@ -134,7 +134,6 @@ public class UMLDiagramEditorUtil {
 

 	/**

 	 * This method should be called within a workspace modify operation since it creates resources.

-	 *

 	 * @generated

 	 */

 	public static Resource createDiagram(URI diagramURI, URI modelURI, IProgressMonitor progressMonitor) {

@@ -143,15 +142,16 @@ public class UMLDiagramEditorUtil {
 		final Resource diagramResource = editingDomain.getResourceSet().createResource(diagramURI);

 		final Resource modelResource = editingDomain.getResourceSet().createResource(modelURI);

 		final String diagramName = diagramURI.lastSegment();

-		AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, Messages.UMLDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST) {

+		AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain,

+				Messages.UMLDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST) {

 			@Override

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

+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)

+					throws ExecutionException {

 				Package model = createInitialModel();

 				attachModelToResource(model, modelResource);

 

-				Diagram diagram = ViewService.createDiagram(

-						model,

-						DeploymentDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				Diagram diagram = ViewService.createDiagram(model, DeploymentDiagramEditPart.MODEL_ID,

+						UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

 				if (diagram != null) {

 					diagramResource.getContents().add(diagram);

 					diagram.setName(diagramName);

@@ -159,8 +159,10 @@ public class UMLDiagramEditorUtil {
 				}

 

 				try {

-					modelResource.save(org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorUtil.getSaveOptions());

-					diagramResource.save(org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorUtil.getSaveOptions());

+					modelResource.save(

+							org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorUtil.getSaveOptions());

+					diagramResource.save(

+							org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorUtil.getSaveOptions());

 				} catch (IOException e) {

 

 					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$

@@ -169,7 +171,8 @@ public class UMLDiagramEditorUtil {
 			}

 		};

 		try {

-			OperationHistoryFactory.getOperationHistory().execute(command, new SubProgressMonitor(progressMonitor, 1), null);

+			OperationHistoryFactory.getOperationHistory().execute(command, new SubProgressMonitor(progressMonitor, 1),

+					null);

 		} catch (ExecutionException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$

 		}

@@ -182,7 +185,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() {

@@ -193,7 +195,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) {

@@ -215,7 +216,8 @@ public class UMLDiagramEditorUtil {
 		}

 

 		if (!editParts.isEmpty()) {

-			diagramPart.getDiagramGraphicalViewer().reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0));

+			diagramPart.getDiagramGraphicalViewer()

+					.reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0));

 		}

 	}

 

@@ -272,7 +274,7 @@ public class UMLDiagramEditorUtil {
 		}

 

 		View view = null;

-		LinkedList<EditPart> editPartHolder = new LinkedList<>();

+		LinkedList<EditPart> editPartHolder = new LinkedList<EditPart>();

 		if (hasStructuralURI && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) {

 			view = lazyElement2ViewMap.getElement2ViewMap().get(targetElement);

 		} else if (findElementsInDiagramByID(diagramEditPart, targetElement, editPartHolder) > 0) {

@@ -285,11 +287,9 @@ public class UMLDiagramEditorUtil {
 

 	/**

 	 * XXX This is quite suspicious code (especially editPartTmpHolder) and likely to be removed soon

-	 *

 	 * @generated

 	 */

 	public static class LazyElement2ViewMap {

-

 		/**

 		 * @generated

 		 */

@@ -318,7 +318,7 @@ public class UMLDiagramEditorUtil {
 		 */

 		public final Map<EObject, View> getElement2ViewMap() {

 			if (element2ViewMap == null) {

-				element2ViewMap = new HashMap<>();

+				element2ViewMap = new HashMap<EObject, View>();

 				// map possible notation elements to itself as these can't be found by view.getElement()

 				for (EObject element : elementSet) {

 					if (element instanceof View) {

@@ -343,7 +343,8 @@ public class UMLDiagramEditorUtil {
 				return true;

 			}

 

-			if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) && elements.contains(parentView.getElement())) {

+			if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement())

+					&& elements.contains(parentView.getElement())) {

 				element2ViewMap.put(parentView.getElement(), parentView);

 				if (elements.size() == element2ViewMap.size()) {

 					return true;

@@ -361,5 +362,6 @@ public class UMLDiagramEditorUtil {
 			}

 			return complete;

 		}

-	} // LazyElement2ViewMap

+	} //LazyElement2ViewMap	

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramUpdater.java
index f789ca63cd0..57ffabd86ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramUpdater.java
@@ -108,7 +108,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	protected UMLDiagramUpdater() {

-		// to prevent instantiation allowing the override

+		//to prevent instantiation allowing the override

 	}

 

 	/**

@@ -160,9 +160,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		Package modelElement = (Package) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getPackagedElements()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

 			PackageableElement childElement = (PackageableElement) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (DependencyNodeEditPart.VISUAL_ID.equals(visualID)) {

@@ -198,8 +197,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ConstraintEditPart.VISUAL_ID.equals(visualID)) {

@@ -207,8 +205,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CommentEditPart.VISUAL_ID.equals(visualID)) {

@@ -216,8 +213,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedMembers()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedMembers().iterator(); it.hasNext();) {

 			NamedElement childElement = (NamedElement) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (DefaultNamedElementEditPart.VISUAL_ID.equals(visualID)) {

@@ -240,9 +236,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		Model modelElement = (Model) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getPackagedElements()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

 			PackageableElement childElement = (PackageableElement) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ModelEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -274,8 +269,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CommentEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -283,8 +277,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -307,9 +300,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		Package modelElement = (Package) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getPackagedElements()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

 			PackageableElement childElement = (PackageableElement) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ModelEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -341,8 +333,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CommentEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -350,8 +341,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -374,9 +364,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		Device modelElement = (Device) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getNestedNodes()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getNestedNodes().iterator(); it.hasNext();) {

 			Node childElement = (Node) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ExecutionEnvironmentEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -392,8 +381,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (DeploymentSpecAsClassifierEditPart.VISUAL_ID.equals(visualID)) {

@@ -416,9 +404,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getNestedNodes()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getNestedNodes().iterator(); it.hasNext();) {

 			Node childElement = (Node) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ExecutionEnvironmentEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -426,8 +413,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ArtifactEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -454,9 +440,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		Node modelElement = (Node) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getNestedNodes()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getNestedNodes().iterator(); it.hasNext();) {

 			Node childElement = (Node) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (DeviceEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -472,8 +457,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ArtifactEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -500,9 +484,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		Artifact modelElement = (Artifact) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getNestedArtifacts()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getNestedArtifacts().iterator(); it.hasNext();) {

 			Artifact childElement = (Artifact) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ArtifactEditPartACN.VISUAL_ID.equals(visualID)) {

@@ -529,9 +512,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		Model modelElement = (Model) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getPackagedElements()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

 			PackageableElement childElement = (PackageableElement) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ModelEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -563,8 +545,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CommentEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -572,8 +553,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -596,9 +576,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		Package modelElement = (Package) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getPackagedElements()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

 			PackageableElement childElement = (PackageableElement) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PackageEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -626,8 +605,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CommentEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -635,8 +613,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -659,9 +636,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		Device modelElement = (Device) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getNestedNodes()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getNestedNodes().iterator(); it.hasNext();) {

 			Node childElement = (Node) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ExecutionEnvironmentEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -677,8 +653,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (DeploymentSpecAsClassifierEditPart.VISUAL_ID.equals(visualID)) {

@@ -701,9 +676,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ArtifactEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -715,8 +689,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedNodes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedNodes().iterator(); it.hasNext();) {

 			Node childElement = (Node) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ExecutionEnvironmentEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -739,9 +712,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		Node modelElement = (Node) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getNestedNodes()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getNestedNodes().iterator(); it.hasNext();) {

 			Node childElement = (Node) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (DeviceEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -757,8 +729,7 @@ 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();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ArtifactEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -785,9 +756,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		Artifact modelElement = (Artifact) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getNestedArtifacts()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getNestedArtifacts().iterator(); it.hasNext();) {

 			Artifact childElement = (Artifact) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ArtifactEditPartACN.VISUAL_ID.equals(visualID)) {

@@ -814,9 +784,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		Artifact modelElement = (Artifact) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<>();

-		for (Iterator<?> it = modelElement.getNestedArtifacts()

-				.iterator(); it.hasNext();) {

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getNestedArtifacts().iterator(); it.hasNext();) {

 			Artifact childElement = (Artifact) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ArtifactEditPartACN.VISUAL_ID.equals(visualID)) {

@@ -1075,7 +1044,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getPackage_DeploymentDiagram_ContainedLinks(View view) {

 		Package modelElement = (Package) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_CommunicationPath_Edge(modelElement));

@@ -1094,7 +1063,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getModel_Shape_ContainedLinks(View view) {

 		Model modelElement = (Model) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_CommunicationPath_Edge(modelElement));

@@ -1106,7 +1075,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getPackage_Shape_ContainedLinks(View view) {

 		Package modelElement = (Package) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_CommunicationPath_Edge(modelElement));

@@ -1118,7 +1087,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getConstraint_Shape_ContainedLinks(View view) {

 		Constraint modelElement = (Constraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));

 		return result;

 	}

@@ -1128,7 +1097,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getComment_Shape_ContainedLinks(View view) {

 		Comment modelElement = (Comment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));

 		return result;

 	}

@@ -1138,7 +1107,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_Shape_ContainedLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1149,7 +1118,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDevice_Shape_ContainedLinks(View view) {

 		Device modelElement = (Device) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1160,7 +1129,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getArtifact_Shape_ContainedLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1171,7 +1140,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getNode_Shape_ContainedLinks(View view) {

 		Node modelElement = (Node) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1189,7 +1158,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_Shape_ContainedLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1200,7 +1169,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getModel_Shape_CN_ContainedLinks(View view) {

 		Model modelElement = (Model) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_CommunicationPath_Edge(modelElement));

@@ -1212,7 +1181,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getPackage_Shape_CN_ContainedLinks(View view) {

 		Package modelElement = (Package) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_CommunicationPath_Edge(modelElement));

@@ -1224,7 +1193,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDevice_Shape_CCN_ContainedLinks(View view) {

 		Device modelElement = (Device) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1235,7 +1204,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDevice_Shape_CN_ContainedLinks(View view) {

 		Device modelElement = (Device) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1246,7 +1215,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_Shape_CCN_ContainedLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1257,7 +1226,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_Shape_CN_ContainedLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1268,7 +1237,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getNode_Shape_CCN_ContainedLinks(View view) {

 		Node modelElement = (Node) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1279,7 +1248,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getNode_Shape_CN_ContainedLinks(View view) {

 		Node modelElement = (Node) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1290,7 +1259,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getArtifact_Shape_CCN_ContainedLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1301,7 +1270,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getArtifact_Shape_ACN_ContainedLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1312,7 +1281,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getArtifact_Shape_CN_ContainedLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1323,7 +1292,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getComment_Shape_CN_ContainedLinks(View view) {

 		Comment modelElement = (Comment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));

 		return result;

 	}

@@ -1333,7 +1302,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getConstraint_Shape_CN_ContainedLinks(View view) {

 		Constraint modelElement = (Constraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));

 		return result;

 	}

@@ -1343,7 +1312,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_Shape_CCN_ContainedLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1354,7 +1323,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_Shape_CN_ContainedLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1365,7 +1334,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_Shape_ACN_ContainedLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

@@ -1411,7 +1380,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getCommunicationPath_Edge_ContainedLinks(View view) {

 		CommunicationPath modelElement = (CommunicationPath) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

 		return result;

 	}

@@ -1421,10 +1390,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDependency_Shape_IncomingLinks(View view) {

 		Dependency modelElement = (Dependency) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

@@ -1437,10 +1408,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getModel_Shape_IncomingLinks(View view) {

 		Model modelElement = (Model) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

@@ -1453,10 +1426,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getPackage_Shape_IncomingLinks(View view) {

 		Package modelElement = (Package) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

@@ -1469,10 +1444,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getConstraint_Shape_IncomingLinks(View view) {

 		Constraint modelElement = (Constraint) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

@@ -1485,10 +1462,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getComment_Shape_IncomingLinks(View view) {

 		Comment modelElement = (Comment) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -1497,10 +1476,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_Shape_IncomingLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1515,10 +1496,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDevice_Shape_IncomingLinks(View view) {

 		Device modelElement = (Device) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1533,10 +1516,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getArtifact_Shape_IncomingLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1551,10 +1536,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getNode_Shape_IncomingLinks(View view) {

 		Node modelElement = (Node) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1569,10 +1556,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getNamedElement_DefaultShape_IncomingLinks(View view) {

 		NamedElement modelElement = (NamedElement) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

@@ -1585,10 +1574,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_Shape_IncomingLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1603,10 +1594,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getModel_Shape_CN_IncomingLinks(View view) {

 		Model modelElement = (Model) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

@@ -1619,10 +1612,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getPackage_Shape_CN_IncomingLinks(View view) {

 		Package modelElement = (Package) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

@@ -1635,10 +1630,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDevice_Shape_CCN_IncomingLinks(View view) {

 		Device modelElement = (Device) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1653,10 +1650,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDevice_Shape_CN_IncomingLinks(View view) {

 		Device modelElement = (Device) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1671,10 +1670,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_Shape_CCN_IncomingLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1689,10 +1690,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_Shape_CN_IncomingLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1707,10 +1710,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getNode_Shape_CCN_IncomingLinks(View view) {

 		Node modelElement = (Node) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1725,10 +1730,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getNode_Shape_CN_IncomingLinks(View view) {

 		Node modelElement = (Node) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1743,10 +1750,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getArtifact_Shape_CCN_IncomingLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1761,10 +1770,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getArtifact_Shape_ACN_IncomingLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1779,10 +1790,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getArtifact_Shape_CN_IncomingLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1797,10 +1810,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getComment_Shape_CN_IncomingLinks(View view) {

 		Comment modelElement = (Comment) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -1809,10 +1824,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getConstraint_Shape_CN_IncomingLinks(View view) {

 		Constraint modelElement = (Constraint) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

@@ -1825,10 +1842,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_Shape_CCN_IncomingLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1843,10 +1862,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_Shape_CN_IncomingLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1861,10 +1882,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_Shape_ACN_IncomingLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1879,10 +1902,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeployment_Edge_IncomingLinks(View view) {

 		Deployment modelElement = (Deployment) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

@@ -1895,10 +1920,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getManifestation_Edge_IncomingLinks(View view) {

 		Manifestation modelElement = (Manifestation) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

@@ -1911,10 +1938,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getGeneralization_Edge_IncomingLinks(View view) {

 		Generalization modelElement = (Generalization) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -1923,10 +1952,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDependency_Edge_IncomingLinks(View view) {

 		Dependency modelElement = (Dependency) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

@@ -1939,10 +1970,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDependency_BranchEdge_IncomingLinks(View view) {

 		Dependency modelElement = (Dependency) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

@@ -1955,10 +1988,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getCommunicationPath_Edge_IncomingLinks(View view) {

 		CommunicationPath modelElement = (CommunicationPath) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Deployment_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

@@ -1973,7 +2008,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDependency_Shape_OutgoingLinks(View view) {

 		Dependency modelElement = (Dependency) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

@@ -1986,7 +2021,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getModel_Shape_OutgoingLinks(View view) {

 		Model modelElement = (Model) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

@@ -1999,7 +2034,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getPackage_Shape_OutgoingLinks(View view) {

 		Package modelElement = (Package) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

@@ -2012,7 +2047,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getConstraint_Shape_OutgoingLinks(View view) {

 		Constraint modelElement = (Constraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

@@ -2026,7 +2061,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getComment_Shape_OutgoingLinks(View view) {

 		Comment modelElement = (Comment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));

 		return result;

 	}

@@ -2036,7 +2071,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_Shape_OutgoingLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2051,7 +2086,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDevice_Shape_OutgoingLinks(View view) {

 		Device modelElement = (Device) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2066,7 +2101,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getArtifact_Shape_OutgoingLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2081,7 +2116,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getNode_Shape_OutgoingLinks(View view) {

 		Node modelElement = (Node) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2096,7 +2131,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getNamedElement_DefaultShape_OutgoingLinks(View view) {

 		NamedElement modelElement = (NamedElement) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

@@ -2109,7 +2144,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_Shape_OutgoingLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2124,7 +2159,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getModel_Shape_CN_OutgoingLinks(View view) {

 		Model modelElement = (Model) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

@@ -2137,7 +2172,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getPackage_Shape_CN_OutgoingLinks(View view) {

 		Package modelElement = (Package) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

@@ -2150,7 +2185,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDevice_Shape_CCN_OutgoingLinks(View view) {

 		Device modelElement = (Device) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2165,7 +2200,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDevice_Shape_CN_OutgoingLinks(View view) {

 		Device modelElement = (Device) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2180,7 +2215,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_Shape_CCN_OutgoingLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2195,7 +2230,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_Shape_CN_OutgoingLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2210,7 +2245,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getNode_Shape_CCN_OutgoingLinks(View view) {

 		Node modelElement = (Node) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2225,7 +2260,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getNode_Shape_CN_OutgoingLinks(View view) {

 		Node modelElement = (Node) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2240,7 +2275,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getArtifact_Shape_CCN_OutgoingLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2255,7 +2290,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getArtifact_Shape_ACN_OutgoingLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2270,7 +2305,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getArtifact_Shape_CN_OutgoingLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2285,7 +2320,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getComment_Shape_CN_OutgoingLinks(View view) {

 		Comment modelElement = (Comment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));

 		return result;

 	}

@@ -2295,7 +2330,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getConstraint_Shape_CN_OutgoingLinks(View view) {

 		Constraint modelElement = (Constraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

@@ -2309,7 +2344,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_Shape_CCN_OutgoingLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2324,7 +2359,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_Shape_CN_OutgoingLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2339,7 +2374,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_Shape_ACN_OutgoingLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2354,7 +2389,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDeployment_Edge_OutgoingLinks(View view) {

 		Deployment modelElement = (Deployment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

@@ -2367,7 +2402,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getManifestation_Edge_OutgoingLinks(View view) {

 		Manifestation modelElement = (Manifestation) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

@@ -2387,7 +2422,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDependency_Edge_OutgoingLinks(View view) {

 		Dependency modelElement = (Dependency) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

@@ -2400,7 +2435,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDependency_BranchEdge_OutgoingLinks(View view) {

 		Dependency modelElement = (Dependency) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

@@ -2413,7 +2448,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getCommunicationPath_Edge_OutgoingLinks(View view) {

 		CommunicationPath modelElement = (CommunicationPath) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

 		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

@@ -2428,9 +2463,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Deployment_Edge(

 			DeploymentTarget container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> links = container.getDeployments()

-				.iterator(); links.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getDeployments().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Deployment) {

 				continue;

@@ -2451,7 +2485,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Deployment_Edge, DeploymentEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Deployment_Edge,

+					DeploymentEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2460,9 +2495,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Manifestation_Edge(Artifact container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> links = container.getManifestations()

-				.iterator(); links.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getManifestations().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Manifestation) {

 				continue;

@@ -2483,7 +2517,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_Edge, ManifestationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_Edge,

+					ManifestationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2492,9 +2527,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_Edge(Classifier container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> links = container.getGeneralizations()

-				.iterator(); links.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Generalization) {

 				continue;

@@ -2505,7 +2539,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			}

 			Classifier dst = link.getGeneral();

 			Classifier src = link.getSpecific();

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_Edge, GeneralizationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_Edge,

+					GeneralizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2514,9 +2549,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_Edge(Package container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Dependency) {

 				continue;

@@ -2537,7 +2571,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge, DependencyEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge,

+					DependencyEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2546,9 +2581,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_BranchEdge(Package container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Dependency) {

 				continue;

@@ -2569,7 +2603,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge, DependencyBranchEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge,

+					DependencyBranchEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2578,9 +2613,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_CommunicationPath_Edge(Package container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof CommunicationPath) {

 				continue;

@@ -2601,7 +2635,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			Type src = (Type) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.CommunicationPath_Edge, CommunicationPathEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.CommunicationPath_Edge,

+					CommunicationPathEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2611,11 +2646,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(

 			Element target, CrossReferenceAdapter crossReferencer) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

 		for (EStructuralFeature.Setting setting : settings) {

 			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {

-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID));

+				result.add(new UMLLinkDescriptor(setting.getEObject(), target,

+						UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID));

 			}

 		}

 		return result;

@@ -2626,11 +2662,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(

 			Element target, CrossReferenceAdapter crossReferencer) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

 		for (EStructuralFeature.Setting setting : settings) {

 			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {

-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID));

+				result.add(new UMLLinkDescriptor(setting.getEObject(), target,

+						UMLElementTypes.Constraint_ConstrainedElementEdge,

+						ConstraintConstrainedElementEditPart.VISUAL_ID));

 			}

 		}

 		return result;

@@ -2641,10 +2679,11 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Deployment_Edge(NamedElement target,

 			CrossReferenceAdapter crossReferencer) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

 		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Deployment) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier()

+					|| false == setting.getEObject() instanceof Deployment) {

 				continue;

 			}

 			Deployment link = (Deployment) setting.getEObject();

@@ -2657,7 +2696,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Deployment_Edge, DeploymentEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Deployment_Edge,

+					DeploymentEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2667,10 +2707,11 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Manifestation_Edge(NamedElement target,

 			CrossReferenceAdapter crossReferencer) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

 		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Manifestation) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier()

+					|| false == setting.getEObject() instanceof Manifestation) {

 				continue;

 			}

 			Manifestation link = (Manifestation) setting.getEObject();

@@ -2683,7 +2724,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Manifestation_Edge, ManifestationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Manifestation_Edge,

+					ManifestationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2693,10 +2735,11 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_Edge(Classifier target,

 			CrossReferenceAdapter crossReferencer) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

 		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() || false == setting.getEObject() instanceof Generalization) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General()

+					|| false == setting.getEObject() instanceof Generalization) {

 				continue;

 			}

 			Generalization link = (Generalization) setting.getEObject();

@@ -2704,7 +2747,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			Classifier src = link.getSpecific();

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Generalization_Edge, GeneralizationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Generalization_Edge,

+					GeneralizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2714,10 +2758,11 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_Edge(NamedElement target,

 			CrossReferenceAdapter crossReferencer) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

 		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier()

+					|| false == setting.getEObject() instanceof Dependency) {

 				continue;

 			}

 			Dependency link = (Dependency) setting.getEObject();

@@ -2730,7 +2775,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_Edge, DependencyEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_Edge,

+					DependencyEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2740,10 +2786,11 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_BranchEdge(NamedElement target,

 			CrossReferenceAdapter crossReferencer) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

 		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier()

+					|| false == setting.getEObject() instanceof Dependency) {

 				continue;

 			}

 			Dependency link = (Dependency) setting.getEObject();

@@ -2756,7 +2803,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_BranchEdge, DependencyBranchEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_BranchEdge,

+					DependencyBranchEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2766,10 +2814,11 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_CommunicationPath_Edge(Type target,

 			CrossReferenceAdapter crossReferencer) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

 		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() || false == setting.getEObject() instanceof CommunicationPath) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType()

+					|| false == setting.getEObject() instanceof CommunicationPath) {

 				continue;

 			}

 			CommunicationPath link = (CommunicationPath) setting.getEObject();

@@ -2782,7 +2831,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			Type src = (Type) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.CommunicationPath_Edge, CommunicationPathEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.CommunicationPath_Edge,

+					CommunicationPathEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2792,11 +2842,11 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(

 			Comment source) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> destinations = source.getAnnotatedElements()

-				.iterator(); destinations.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {

 			Element destination = (Element) destinations.next();

-			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Comment_AnnotatedElementEdge,

+					CommentAnnotatedElementEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2806,11 +2856,11 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(

 			Constraint source) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> destinations = source.getConstrainedElements()

-				.iterator(); destinations.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {

 			Element destination = (Element) destinations.next();

-			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Constraint_ConstrainedElementEdge,

+					ConstraintConstrainedElementEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2831,9 +2881,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		if (container == null) {

 			return Collections.emptyList();

 		}

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> links = container.getDeployments()

-				.iterator(); links.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getDeployments().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Deployment) {

 				continue;

@@ -2857,7 +2906,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Deployment_Edge, DeploymentEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Deployment_Edge,

+					DeploymentEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2878,9 +2928,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		if (container == null) {

 			return Collections.emptyList();

 		}

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> links = container.getManifestations()

-				.iterator(); links.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getManifestations().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Manifestation) {

 				continue;

@@ -2904,7 +2953,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_Edge, ManifestationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_Edge,

+					ManifestationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2925,9 +2975,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		if (container == null) {

 			return Collections.emptyList();

 		}

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> links = container.getGeneralizations()

-				.iterator(); links.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Generalization) {

 				continue;

@@ -2941,7 +2990,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_Edge, GeneralizationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_Edge,

+					GeneralizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -2962,9 +3012,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		if (container == null) {

 			return Collections.emptyList();

 		}

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Dependency) {

 				continue;

@@ -2988,7 +3037,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge, DependencyEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge,

+					DependencyEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -3009,9 +3059,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		if (container == null) {

 			return Collections.emptyList();

 		}

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Dependency) {

 				continue;

@@ -3035,7 +3084,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge, DependencyBranchEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge,

+					DependencyBranchEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -3056,9 +3106,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		if (container == null) {

 			return Collections.emptyList();

 		}

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof CommunicationPath) {

 				continue;

@@ -3082,7 +3131,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.CommunicationPath_Edge, CommunicationPathEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.CommunicationPath_Edge,

+					CommunicationPathEditPart.VISUAL_ID));

 		}

 		return result;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDocumentProvider.java
index 1c81d43e5ab..2701134dfc8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDocumentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDocumentProvider.java
@@ -77,9 +77,9 @@ 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", //$NON-NLS-1$

+									"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ 

 					null));

 		}

 		IEditorInput editorInput = (IEditorInput) element;

@@ -98,9 +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", //$NON-NLS-1$

+									"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ 

 					null));

 		}

 		IDocument document = createEmptyDocument();

@@ -159,7 +159,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	private TransactionalEditingDomain createEditingDomain() {

 		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();

 		editingDomain.setID("org.eclipse.papyrus.uml.diagram.deployment.EditingDomain"); //$NON-NLS-1$

-		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD))

+		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter

+				.createNotifierFilter(editingDomain.getResourceSet())

+				.and(NotificationFilter.createEventTypeFilter(Notification.ADD))

 				.and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));

 		editingDomain.getResourceSet().eAdapters().add(new Adapter() {

 

@@ -217,7 +219,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 					try {

 						@SuppressWarnings({ "rawtypes", "unchecked" })

 						Map<?, ?> options = new HashMap(GMFResourceFactory.getDefaultLoadOptions());

-						// @see 171060

+						// @see 171060 

 						// options.put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);

 						resource.load(options);

 					} catch (IOException e) {

@@ -254,9 +256,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			}

 		} 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", //$NON-NLS-1$

+									"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ 

 					null));

 		}

 	}

@@ -315,7 +317,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	protected void doValidateState(Object element, Object computationContext) throws CoreException {

 		ResourceSetInfo info = getResourceSetInfo(element);

 		if (info != null) {

-			LinkedList<IFile> files2Validate = new LinkedList<>();

+			LinkedList<IFile> files2Validate = new LinkedList<IFile>();

 			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 				Resource nextResource = it.next();

 				IFile file = WorkspaceSynchronizer.getFile(nextResource);

@@ -323,7 +325,8 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 					files2Validate.add(file);

 				}

 			}

-			ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]), computationContext);

+			ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]),

+					computationContext);

 		}

 

 		super.doValidateState(element, computationContext);

@@ -426,7 +429,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	protected ISchedulingRule getResetRule(Object element) {

 		ResourceSetInfo info = getResourceSetInfo(element);

 		if (info != null) {

-			LinkedList<ISchedulingRule> rules = new LinkedList<>();

+			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

 			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 				Resource nextResource = it.next();

 				IFile file = WorkspaceSynchronizer.getFile(nextResource);

@@ -446,7 +449,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	protected ISchedulingRule getSaveRule(Object element) {

 		ResourceSetInfo info = getResourceSetInfo(element);

 		if (info != null) {

-			LinkedList<ISchedulingRule> rules = new LinkedList<>();

+			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

 			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 				Resource nextResource = it.next();

 				IFile file = WorkspaceSynchronizer.getFile(nextResource);

@@ -466,7 +469,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	protected ISchedulingRule getSynchronizeRule(Object element) {

 		ResourceSetInfo info = getResourceSetInfo(element);

 		if (info != null) {

-			LinkedList<ISchedulingRule> rules = new LinkedList<>();

+			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

 			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 				Resource nextResource = it.next();

 				IFile file = WorkspaceSynchronizer.getFile(nextResource);

@@ -486,7 +489,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	protected ISchedulingRule getValidateStateRule(Object element) {

 		ResourceSetInfo info = getResourceSetInfo(element);

 		if (info != null) {

-			LinkedList<ISchedulingRule> files = new LinkedList<>();

+			LinkedList<ISchedulingRule> files = new LinkedList<ISchedulingRule>();

 			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 				Resource nextResource = it.next();

 				IFile file = WorkspaceSynchronizer.getFile(nextResource);

@@ -494,7 +497,8 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 					files.add(file);

 				}

 			}

-			return ResourcesPlugin.getWorkspace().getRuleFactory().validateEditRule(files.toArray(new IFile[files.size()]));

+			return ResourcesPlugin.getWorkspace().getRuleFactory()

+					.validateEditRule(files.toArray(new IFile[files.size()]));

 		}

 		return null;

 	}

@@ -546,26 +550,26 @@ 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());

 						} catch (IOException e) {

 							fireElementStateChangeFailed(element);

-							throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null));

+							throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID,

+									EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null));

 						}

 					}

 					monitor.worked(1);

@@ -590,23 +594,28 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			} 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$

+						NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError,

+								new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$

+										"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ 

 						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$

+						"Incorrect document used: " + document //$NON-NLS-1$

+								+ " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", //$NON-NLS-1$

+						null));

 			}

 			IDiagramDocument diagramDocument = (IDiagramDocument) document;

-			final Resource newResource = diagramDocument.getEditingDomain().getResourceSet().createResource(newResoruceURI);

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

+				new AbstractTransactionalCommand(diagramDocument.getEditingDomain(),

+						NLS.bind(Messages.UMLDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) {

 					@Override

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

+					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)

+							throws ExecutionException {

 						newResource.getContents().add(diagramCopy);

 						return CommandResult.newOKCommandResult();

 					}

@@ -614,10 +623,12 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 				newResource.save(UMLDiagramEditorUtil.getSaveOptions());

 			} catch (ExecutionException e) {

 				fireElementStateChangeFailed(element);

-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null));

+				throw new CoreException(

+						new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null));

 			} catch (IOException e) {

 				fireElementStateChangeFailed(element);

-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null));

+				throw new CoreException(

+						new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null));

 			}

 			newResource.unload();

 		}

@@ -632,7 +643,8 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			try {

 				file.refreshLocal(IResource.DEPTH_INFINITE, monitor);

 			} catch (CoreException ex) {

-				UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_handleElementContentChanged, ex);

+				UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_handleElementContentChanged,

+						ex);

 				// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.FileDocumentProvider_handleElementContentChanged

 			}

 		}

@@ -658,7 +670,8 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 */

 	protected void handleElementMoved(IEditorInput input, URI uri) {

 		if (input instanceof FileEditorInput) {

-			IFile newFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(URI.decode(uri.path())).removeFirstSegments(1));

+			IFile newFile = ResourcesPlugin.getWorkspace().getRoot()

+					.getFile(new Path(URI.decode(uri.path())).removeFirstSegments(1));

 			fireElementMoved(input, newFile == null ? null : new FileEditorInput(newFile));

 			return;

 		}

@@ -712,7 +725,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 		/**

 		 * @generated

 		 */

-		private LinkedList<Resource> myUnSynchronizedResources = new LinkedList<>();

+		private LinkedList<Resource> myUnSynchronizedResources = new LinkedList<Resource>();

 

 		/**

 		 * @generated

@@ -788,7 +801,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 		 * @generated

 		 */

 		public Iterator<Resource> getLoadedResourcesIterator() {

-			return new ArrayList<>(getResourceSet().getResources()).iterator();

+			return new ArrayList<Resource>(getResourceSet().getResources()).iterator();

 		}

 

 		/**

@@ -987,7 +1000,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 		 */

 		public ResourceSetModificationListener(ResourceSetInfo info) {

 			myInfo = info;

-			myModifiedFilter = NotificationFilter.createEventTypeFilter(Notification.SET).or(NotificationFilter.createEventTypeFilter(Notification.UNSET)).and(NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED));

+			myModifiedFilter = NotificationFilter.createEventTypeFilter(Notification.SET)

+					.or(NotificationFilter.createEventTypeFilter(Notification.UNSET))

+					.and(NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED));

 		}

 

 		/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLInitDiagramFileAction.java
index 804e901448d..2cd92e0cd80 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLInitDiagramFileAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLInitDiagramFileAction.java
@@ -87,19 +87,15 @@ public class UMLInitDiagramFileAction implements IObjectActionDelegate {
 			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,

+			MessageDialog.openError(getShell(), Messages.InitDiagramFile_ResourceErrorDialogTitle,

 					Messages.InitDiagramFile_ResourceErrorDialogMessage);

 			return;

 		}

 		Wizard wizard = new UMLNewDiagramFileWizard(domainModelURI, diagramRoot, editingDomain);

-		wizard.setWindowTitle(NLS.bind(

-				Messages.InitDiagramFile_WizardTitle,

-				DeploymentDiagramEditPart.MODEL_ID));

+		wizard.setWindowTitle(NLS.bind(Messages.InitDiagramFile_WizardTitle, DeploymentDiagramEditPart.MODEL_ID));

 		UMLDiagramEditorUtil.runWizard(getShell(), wizard, "InitDiagramFile"); //$NON-NLS-1$

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLNewDiagramFileWizard.java
index 056ca9453b9..2f838793285 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLNewDiagramFileWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLNewDiagramFileWizard.java
@@ -68,11 +68,11 @@ public class UMLNewDiagramFileWizard extends Wizard {
 		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,

-				DeploymentDiagramEditPart.MODEL_ID));

+		myFileCreationPage.setDescription(

+				NLS.bind(Messages.UMLNewDiagramFileWizard_CreationPageDescription, DeploymentDiagramEditPart.MODEL_ID));

 		IPath filePath;

 		String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment());

 		if (domainModelURI.isPlatformResource()) {

@@ -84,10 +84,11 @@ public class UMLNewDiagramFileWizard extends Wizard {
 			throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$

 		}

 		myFileCreationPage.setContainerFullPath(filePath);

-		myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(

-				filePath, fileName, "PapyrusUMLDeployment_diagram")); //$NON-NLS-1$

+		myFileCreationPage.setFileName(

+				UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "PapyrusUMLDeployment_diagram")); //$NON-NLS-1$

 

-		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName);

+		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(

+				Messages.UMLNewDiagramFileWizard_RootSelectionPageName);

 		diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);

 		diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription);

 		diagramRootElementSelectionPage.setModelElement(diagramRoot);

@@ -109,46 +110,40 @@ public class UMLNewDiagramFileWizard extends Wizard {
 	 */

 	@Override

 	public boolean performFinish() {

-		LinkedList<IFile> affectedFiles = new LinkedList<>();

+		LinkedList<IFile> affectedFiles = new LinkedList<IFile>();

 		IFile diagramFile = myFileCreationPage.createNewFile();

 		UMLDiagramEditorUtil.setCharset(diagramFile);

 		affectedFiles.add(diagramFile);

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

+		AbstractTransactionalCommand command = new AbstractTransactionalCommand(myEditingDomain,

+				Messages.UMLNewDiagramFileWizard_InitDiagramCommand, affectedFiles) {

 

 			@Override

-			protected CommandResult doExecuteWithResult(

-					IProgressMonitor monitor, IAdaptable info)

+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)

 					throws ExecutionException {

-				String diagramVID = UMLVisualIDRegistry.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement());

+				String diagramVID = UMLVisualIDRegistry

+						.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement());

 				if (diagramVID.equals(DeploymentDiagramEditPart.VISUAL_ID)) {

-					return CommandResult.newErrorCommandResult(

-							Messages.UMLNewDiagramFileWizard_IncorrectRootError);

+					return CommandResult.newErrorCommandResult(Messages.UMLNewDiagramFileWizard_IncorrectRootError);

 				}

-				Diagram diagram = ViewService.createDiagram(

-						diagramRootElementSelectionPage.getModelElement(), DeploymentDiagramEditPart.MODEL_ID,

-						UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				Diagram diagram = ViewService.createDiagram(diagramRootElementSelectionPage.getModelElement(),

+						DeploymentDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

 				diagramResource.getContents().add(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$

+			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$

+			UMLDiagramEditorPlugin.getInstance().logError("Unable to open editor", ex); //$NON-NLS-1$

 		}

 		return true;

 	}

@@ -182,9 +177,8 @@ public class UMLNewDiagramFileWizard extends Wizard {
 				setErrorMessage(Messages.UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage);

 				return false;

 			}

-			boolean result = ViewService.getInstance().provides(

-					new CreateDiagramViewOperation(

-							new EObjectAdapter(getModelElement()),

+			boolean result = ViewService.getInstance()

+					.provides(new CreateDiagramViewOperation(new EObjectAdapter(getModelElement()),

 							DeploymentDiagramEditPart.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.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLPaletteFactory.java
index f15b07d9835..d57b1f06970 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLPaletteFactory.java
@@ -187,7 +187,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createModelCreationTool() {

-		List<IElementType> types = new ArrayList<>(2);

+		List<IElementType> types = new ArrayList<IElementType>(2);

 		types.add(UMLElementTypes.Model_Shape_CN);

 		types.add(UMLElementTypes.Model_Shape);

 		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

@@ -198,7 +198,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createPackageCreationTool() {

-		List<IElementType> types = new ArrayList<>(2);

+		List<IElementType> types = new ArrayList<IElementType>(2);

 		types.add(UMLElementTypes.Package_Shape);

 		types.add(UMLElementTypes.Package_Shape_CN);

 		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

@@ -209,7 +209,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createCommunicationPath1CreationTool() {

-		List<IElementType> types = new ArrayList<>(1);

+		List<IElementType> types = new ArrayList<IElementType>(1);

 		types.add(UMLElementTypes.CommunicationPath_Edge);

 		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

 		return tool;

@@ -219,7 +219,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createNodeCreationTool() {

-		List<IElementType> types = new ArrayList<>(3);

+		List<IElementType> types = new ArrayList<IElementType>(3);

 		types.add(UMLElementTypes.Node_Shape);

 		types.add(UMLElementTypes.Node_Shape_CCN);

 		types.add(UMLElementTypes.Node_Shape_CN);

@@ -231,7 +231,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createDeviceCreationTool() {

-		List<IElementType> types = new ArrayList<>(3);

+		List<IElementType> types = new ArrayList<IElementType>(3);

 		types.add(UMLElementTypes.Device_Shape);

 		types.add(UMLElementTypes.Device_Shape_CCN);

 		types.add(UMLElementTypes.Device_Shape_CN);

@@ -243,7 +243,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createDeploymentSpecification5CreationTool() {

-		List<IElementType> types = new ArrayList<>(4);

+		List<IElementType> types = new ArrayList<IElementType>(4);

 		types.add(UMLElementTypes.DeploymentSpecification_Shape);

 		types.add(UMLElementTypes.DeploymentSpecification_Shape_CCN);

 		types.add(UMLElementTypes.DeploymentSpecification_Shape_CN);

@@ -256,7 +256,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createExecutionEnvironmentCreationTool() {

-		List<IElementType> types = new ArrayList<>(3);

+		List<IElementType> types = new ArrayList<IElementType>(3);

 		types.add(UMLElementTypes.ExecutionEnvironment_Shape);

 		types.add(UMLElementTypes.ExecutionEnvironment_Shape_CCN);

 		types.add(UMLElementTypes.ExecutionEnvironment_Shape_CN);

@@ -268,7 +268,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createArtifactCreationTool() {

-		List<IElementType> types = new ArrayList<>(4);

+		List<IElementType> types = new ArrayList<IElementType>(4);

 		types.add(UMLElementTypes.Artifact_Shape);

 		types.add(UMLElementTypes.Artifact_Shape_CCN);

 		types.add(UMLElementTypes.Artifact_Shape_ACN);

@@ -281,7 +281,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createCommentCreationTool() {

-		List<IElementType> types = new ArrayList<>(2);

+		List<IElementType> types = new ArrayList<IElementType>(2);

 		types.add(UMLElementTypes.Comment_Shape);

 		types.add(UMLElementTypes.Comment_Shape_CN);

 		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

@@ -292,7 +292,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createConstraintCreationTool() {

-		List<IElementType> types = new ArrayList<>(2);

+		List<IElementType> types = new ArrayList<IElementType>(2);

 		types.add(UMLElementTypes.Constraint_Shape);

 		types.add(UMLElementTypes.Constraint_Shape_CN);

 		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

@@ -303,7 +303,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createLinkCreationTool() {

-		List<IElementType> types = new ArrayList<>(2);

+		List<IElementType> types = new ArrayList<IElementType>(2);

 		types.add(UMLElementTypes.Comment_AnnotatedElementEdge);

 		types.add(UMLElementTypes.Constraint_ConstrainedElementEdge);

 		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

@@ -314,7 +314,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createDependencyCreationTool() {

-		List<IElementType> types = new ArrayList<>(1);

+		List<IElementType> types = new ArrayList<IElementType>(1);

 		types.add(UMLElementTypes.Dependency_Edge);

 		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

 		return tool;

@@ -324,7 +324,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createDependencyBranchCreationTool() {

-		List<IElementType> types = new ArrayList<>(1);

+		List<IElementType> types = new ArrayList<IElementType>(1);

 		types.add(UMLElementTypes.Dependency_BranchEdge);

 		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

 		return tool;

@@ -334,7 +334,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createGeneralizationCreationTool() {

-		List<IElementType> types = new ArrayList<>(1);

+		List<IElementType> types = new ArrayList<IElementType>(1);

 		types.add(UMLElementTypes.Generalization_Edge);

 		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

 		return tool;

@@ -344,7 +344,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createDeploymentCreationTool() {

-		List<IElementType> types = new ArrayList<>(1);

+		List<IElementType> types = new ArrayList<IElementType>(1);

 		types.add(UMLElementTypes.Deployment_Edge);

 		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

 		return tool;

@@ -354,7 +354,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createManifestationCreationTool() {

-		List<IElementType> types = new ArrayList<>(1);

+		List<IElementType> types = new ArrayList<IElementType>(1);

 		types.add(UMLElementTypes.Manifestation_Edge);

 		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

 		return tool;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLVisualIDRegistry.java
index 8e7cd0640d8..22089608868 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/UMLVisualIDRegistry.java
@@ -187,13 +187,15 @@ public class UMLVisualIDRegistry {
 		if (domainElement == null) {

 			return "";

 		}

-		String containerModelID = org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.getModelID(containerView);

+		String containerModelID = org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry

+				.getModelID(containerView);

 		if (!DeploymentDiagramEditPart.MODEL_ID.equals(containerModelID)) {

 			return "";

 		}

 		String containerVisualID;

 		if (DeploymentDiagramEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.getVisualID(containerView);

+			containerVisualID = org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry

+					.getVisualID(containerView);

 		} else {

 			if (containerView instanceof Diagram) {

 				containerVisualID = DeploymentDiagramEditPart.VISUAL_ID;

@@ -225,7 +227,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 					return DeviceEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_Shape((Artifact) domainElement)) {

+				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())

+						&& isArtifact_Shape((Artifact) domainElement)) {

 					return ArtifactEditPart.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

@@ -254,7 +257,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 					return NestedNodeEditPartCN.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_Shape_CN((Artifact) domainElement)) {

+				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())

+						&& isArtifact_Shape_CN((Artifact) domainElement)) {

 					return NestedArtifactNodeEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

@@ -274,7 +278,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) {

 					return PackageEditPartCN.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_Shape_CN((Artifact) domainElement)) {

+				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())

+						&& isArtifact_Shape_CN((Artifact) domainElement)) {

 					return NestedArtifactNodeEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

@@ -314,7 +319,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 					return ExecutionEnvironmentEditPartCN.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_Shape_CCN((Artifact) domainElement)) {

+				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())

+						&& isArtifact_Shape_CCN((Artifact) domainElement)) {

 					return ArtifactEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

@@ -328,7 +334,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 					return ExecutionEnvironmentEditPartCN.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_Shape_CCN((Artifact) domainElement)) {

+				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())

+						&& isArtifact_Shape_CCN((Artifact) domainElement)) {

 					return ArtifactEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

@@ -339,7 +346,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case ArtifactCompositeCompartmentEditPart.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_Shape_ACN((Artifact) domainElement)) {

+				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())

+						&& isArtifact_Shape_ACN((Artifact) domainElement)) {

 					return ArtifactEditPartACN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

@@ -362,7 +370,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 					return NestedNodeEditPartCN.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_Shape_CN((Artifact) domainElement)) {

+				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())

+						&& isArtifact_Shape_CN((Artifact) domainElement)) {

 					return NestedArtifactNodeEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

@@ -379,7 +388,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) {

 					return PackageEditPartCN.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_Shape_CN((Artifact) domainElement)) {

+				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())

+						&& isArtifact_Shape_CN((Artifact) domainElement)) {

 					return NestedArtifactNodeEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

@@ -416,7 +426,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_Shape_CCN((Artifact) domainElement)) {

+				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())

+						&& isArtifact_Shape_CCN((Artifact) domainElement)) {

 					return ArtifactEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

@@ -436,7 +447,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 					return NodeEditPartCN.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_Shape_CCN((Artifact) domainElement)) {

+				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())

+						&& isArtifact_Shape_CCN((Artifact) domainElement)) {

 					return ArtifactEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

@@ -444,7 +456,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case ArtifactCompositeCompartmentEditPartCN.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_Shape_ACN((Artifact) domainElement)) {

+				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())

+						&& isArtifact_Shape_ACN((Artifact) domainElement)) {

 					return ArtifactEditPartACN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

@@ -452,7 +465,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case ArtifactCompositeCompartmentEditPartACN.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_Shape_ACN((Artifact) domainElement)) {

+				if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())

+						&& isArtifact_Shape_ACN((Artifact) domainElement)) {

 					return ArtifactEditPartACN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

@@ -468,13 +482,15 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static boolean canCreateNode(View containerView, String nodeVisualID) {

-		String containerModelID = org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.getModelID(containerView);

+		String containerModelID = org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry

+				.getModelID(containerView);

 		if (!DeploymentDiagramEditPart.MODEL_ID.equals(containerModelID)) {

 			return false;

 		}

 		String containerVisualID;

 		if (DeploymentDiagramEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.getVisualID(containerView);

+			containerVisualID = org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry

+					.getVisualID(containerView);

 		} else {

 			if (containerView instanceof Diagram) {

 				containerVisualID = DeploymentDiagramEditPart.VISUAL_ID;

@@ -1025,7 +1041,8 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	private static boolean isArtifact_Shape(Artifact domainElement) {

-		Object result = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getArtifact(), null).evaluate(domainElement);

+		Object result = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getArtifact(), null)

+				.evaluate(domainElement);

 		return result instanceof Boolean && ((Boolean) result).booleanValue();

 	}

 

@@ -1033,7 +1050,8 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	private static boolean isArtifact_Shape_CCN(Artifact domainElement) {

-		Object result = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getArtifact(), null).evaluate(domainElement);

+		Object result = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getArtifact(), null)

+				.evaluate(domainElement);

 		return result instanceof Boolean && ((Boolean) result).booleanValue();

 	}

 

@@ -1041,7 +1059,8 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	private static boolean isArtifact_Shape_ACN(Artifact domainElement) {

-		Object result = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getArtifact(), null).evaluate(domainElement);

+		Object result = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getArtifact(), null)

+				.evaluate(domainElement);

 		return result instanceof Boolean && ((Boolean) result).booleanValue();

 	}

 

@@ -1049,7 +1068,8 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	private static boolean isArtifact_Shape_CN(Artifact domainElement) {

-		Object result = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getArtifact(), null).evaluate(domainElement);

+		Object result = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getArtifact(), null)

+				.evaluate(domainElement);

 		return result instanceof Boolean && ((Boolean) result).booleanValue();

 	}

 

@@ -1058,7 +1078,7 @@ public class UMLVisualIDRegistry {
 	 */

 	public static boolean checkNodeVisualID(View containerView, EObject domainElement, String candidate) {

 		if (candidate == null) {

-			// unrecognized id is always bad

+			//unrecognized id is always bad

 			return false;

 		}

 		String basic = getNodeVisualID(containerView, domainElement);

@@ -1143,7 +1163,8 @@ public class UMLVisualIDRegistry {
 		 */

 		@Override

 		public String getNodeVisualID(View containerView, EObject domainElement) {

-			return org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);

+			return org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.getNodeVisualID(containerView,

+					domainElement);

 		}

 

 		/**

@@ -1151,7 +1172,8 @@ public class UMLVisualIDRegistry {
 		 */

 		@Override

 		public boolean checkNodeVisualID(View containerView, EObject domainElement, String candidate) {

-			return org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate);

+			return org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.checkNodeVisualID(containerView,

+					domainElement, candidate);

 		}

 

 		/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/ValidateAction.java
index b222f7cab55..ae97e5854fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/ValidateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/part/ValidateAction.java
@@ -77,16 +77,13 @@ 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$

 			}

@@ -99,8 +96,8 @@ 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);

 				} else {

@@ -108,8 +105,7 @@ public class ValidateAction extends Action {
 				}

 			}

 		} catch (Exception e) {

-			UMLDiagramEditorPlugin.getInstance().logError(

-					"Validation action failed", e); //$NON-NLS-1$

+			UMLDiagramEditorPlugin.getInstance().logError("Validation action failed", e); //$NON-NLS-1$

 		}

 	}

 

@@ -122,8 +118,8 @@ public class ValidateAction extends Action {
 			shell = new Shell();

 		}

 

-		DiagramEditPart diagramEditPart = OffscreenEditPartFactory.getInstance().createDiagramEditPart(

-				view.getDiagram(), shell);

+		DiagramEditPart diagramEditPart = OffscreenEditPartFactory.getInstance()

+				.createDiagramEditPart(view.getDiagram(), shell);

 		runValidation(diagramEditPart, view);

 	}

 

@@ -169,8 +165,8 @@ public class ValidateAction extends Action {
 		}

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

@@ -192,11 +188,10 @@ public class ValidateAction extends Action {
 				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);

+			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());

+					EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true), nextStatus.getMessage(),

+					nextStatus.getSeverity());

 		}

 	}

 

@@ -208,7 +203,7 @@ public class ValidateAction extends Action {
 			return;

 		}

 		final Diagnostic rootStatus = emfValidationStatus;

-		List<Diagnostic> allDiagnostics = new ArrayList<>();

+		List<Diagnostic> allDiagnostics = new ArrayList<Diagnostic>();

 		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(

 				diagramEditPart.getDiagramView(),

 				collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics));

@@ -217,11 +212,10 @@ public class ValidateAction extends Action {
 			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);

+				View view = UMLDiagramEditorUtil.findView(diagramEditPart, element, element2ViewMap);

 				addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view),

-						EMFCoreUtil.getQualifiedName(element, true),

-						nextDiagnostic.getMessage(), diagnosticToStatusSeverity(nextDiagnostic.getSeverity()));

+						EMFCoreUtil.getQualifiedName(element, true), nextDiagnostic.getMessage(),

+						diagnosticToStatusSeverity(nextDiagnostic.getSeverity()));

 			}

 		}

 	}

@@ -229,12 +223,12 @@ 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);

 	}

 

 	/**

@@ -247,8 +241,7 @@ 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;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/preferences/DiagramPreferenceInitializer.java
index b049cdb617c..9f56b96ea87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/preferences/DiagramPreferenceInitializer.java
@@ -31,11 +31,11 @@ public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer
 	@Override

 	public void initializeDefaultPreferences() {

 		IPreferenceStore store = getPreferenceStore();

-		DiagramsPreferencePage.initDefaults(store);

-		AppearancePreferencePage.initDefaults(store);

-		ConnectionsPreferencePage.initDefaults(store);

-		PrintingPreferencePage.initDefaults(store);

-		RulerGridPreferencePage.initDefaults(store);

+		DiagramGeneralPreferencePage.initDefaults(store);

+		DiagramAppearancePreferencePage.initDefaults(store);

+		DiagramConnectionsPreferencePage.initDefaults(store);

+		DiagramPrintingPreferencePage.initDefaults(store);

+		DiagramRulersAndGridPreferencePage.initDefaults(store);

 

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/ElementInitializers.java
index 1e20bbac935..285b7687330 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/ElementInitializers.java
@@ -48,8 +48,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Model_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -63,8 +62,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Package_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -78,13 +76,11 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Constraint_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 			Object value_1 = specification_Constraint_Shape(instance);

 			if (value_1 != null) {

-				instance.setSpecification(

-						(ValueSpecification) value_1);

+				instance.setSpecification((ValueSpecification) value_1);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -98,8 +94,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = body_Comment_Shape(instance);

 			if (value_0 != null) {

-				instance.setBody(

-						(String) value_0);

+				instance.setBody((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -113,8 +108,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_ExecutionEnvironment_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -128,8 +122,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Device_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -143,13 +136,12 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Artifact_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

-			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getArtifact(), null).evaluate(instance);

+			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getArtifact(), null)

+					.evaluate(instance);

 			if (value_1 != null) {

-				instance.setFileName(

-						(String) value_1);

+				instance.setFileName((String) value_1);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -163,8 +155,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Node_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -178,13 +169,12 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_DeploymentSpecification_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

-			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getDeploymentSpecification(), null).evaluate(instance);

+			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getDeploymentSpecification(), null)

+					.evaluate(instance);

 			if (value_1 != null) {

-				instance.setFileName(

-						(String) value_1);

+				instance.setFileName((String) value_1);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -198,8 +188,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Model_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -213,8 +202,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Package_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -228,8 +216,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Device_Shape_CCN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -243,8 +230,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Device_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -258,8 +244,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_ExecutionEnvironment_Shape_CCN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -273,8 +258,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_ExecutionEnvironment_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -288,8 +272,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Node_Shape_CCN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -303,8 +286,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Node_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -318,13 +300,12 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Artifact_Shape_CCN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

-			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getArtifact(), null).evaluate(instance);

+			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getArtifact(), null)

+					.evaluate(instance);

 			if (value_1 != null) {

-				instance.setFileName(

-						(String) value_1);

+				instance.setFileName((String) value_1);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -338,13 +319,12 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Artifact_Shape_ACN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

-			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getArtifact(), null).evaluate(instance);

+			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getArtifact(), null)

+					.evaluate(instance);

 			if (value_1 != null) {

-				instance.setFileName(

-						(String) value_1);

+				instance.setFileName((String) value_1);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -358,13 +338,12 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Artifact_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

-			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getArtifact(), null).evaluate(instance);

+			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getArtifact(), null)

+					.evaluate(instance);

 			if (value_1 != null) {

-				instance.setFileName(

-						(String) value_1);

+				instance.setFileName((String) value_1);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -378,8 +357,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = body_Comment_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setBody(

-						(String) value_0);

+				instance.setBody((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -393,13 +371,11 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Constraint_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 			Object value_1 = specification_Constraint_Shape_CN(instance);

 			if (value_1 != null) {

-				instance.setSpecification(

-						(ValueSpecification) value_1);

+				instance.setSpecification((ValueSpecification) value_1);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -413,13 +389,12 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_DeploymentSpecification_Shape_CCN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

-			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getDeploymentSpecification(), null).evaluate(instance);

+			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getDeploymentSpecification(), null)

+					.evaluate(instance);

 			if (value_1 != null) {

-				instance.setFileName(

-						(String) value_1);

+				instance.setFileName((String) value_1);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -433,13 +408,12 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_DeploymentSpecification_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

-			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getDeploymentSpecification(), null).evaluate(instance);

+			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getDeploymentSpecification(), null)

+					.evaluate(instance);

 			if (value_1 != null) {

-				instance.setFileName(

-						(String) value_1);

+				instance.setFileName((String) value_1);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -453,13 +427,12 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_DeploymentSpecification_Shape_ACN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

-			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getDeploymentSpecification(), null).evaluate(instance);

+			Object value_1 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getDeploymentSpecification(), null)

+					.evaluate(instance);

 			if (value_1 != null) {

-				instance.setFileName(

-						(String) value_1);

+				instance.setFileName((String) value_1);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -473,8 +446,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Deployment_Edge(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -488,8 +460,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Manifestation_Edge(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -503,8 +474,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Dependency_Edge(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -518,8 +488,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Dependency_BranchEdge(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -533,8 +502,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_CommunicationPath_Edge(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLEditPartProvider.java
index 64c2db996b5..1899d01e621 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLEditPartProvider.java
@@ -25,8 +25,6 @@ public class UMLEditPartProvider extends DefaultEditPartProvider {
 	 * @generated

 	 */

 	public UMLEditPartProvider() {

-		super(new UMLEditPartFactory(),

-				UMLVisualIDRegistry.TYPED_INSTANCE,

-				DeploymentDiagramEditPart.MODEL_ID);

+		super(new UMLEditPartFactory(), UMLVisualIDRegistry.TYPED_INSTANCE, DeploymentDiagramEditPart.MODEL_ID);

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLElementTypes.java
index 41125c359eb..1c400b13193 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLElementTypes.java
@@ -1,13 +1,13 @@
 /**

  * 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

+  * 

+  * 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.deployment.providers;

 

@@ -20,9 +20,9 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.ENamedElement;

 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.tooling.runtime.providers.DiagramElementTypeImages;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.papyrus.infra.gmfdiag.common.providers.DiagramElementTypes;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.providers.DiagramElementTypeImages;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactEditPartACN;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactEditPartCN;

@@ -83,7 +83,8 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());

+	private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages(

+			UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());

 

 	/**

 	 * @generated

@@ -93,187 +94,185 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_DeploymentDiagram = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Package_DeploymentDiagram"); //$NON-NLS-1$

-

+	public static final IElementType Package_DeploymentDiagram = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Package_DeploymentDiagram"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Dependency_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Dependency_Shape"); //$NON-NLS-1$

-

+	public static final IElementType Dependency_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Dependency_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

 	public static final IElementType Model_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Model_Shape"); //$NON-NLS-1$

-

 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Package_Shape"); //$NON-NLS-1$

-

+	public static final IElementType Package_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Package_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Constraint_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Constraint_Shape"); //$NON-NLS-1$

-

+	public static final IElementType Constraint_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Constraint_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Comment_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Comment_Shape"); //$NON-NLS-1$

-

+	public static final IElementType Comment_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Comment_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType ExecutionEnvironment_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape"); //$NON-NLS-1$

-

+	public static final IElementType ExecutionEnvironment_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

 	public static final IElementType Device_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Device_Shape"); //$NON-NLS-1$

-

 	/**

 	 * @generated

 	 */

-	public static final IElementType Artifact_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Artifact_Shape"); //$NON-NLS-1$

-

+	public static final IElementType Artifact_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Artifact_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

 	public static final IElementType Node_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Node_Shape"); //$NON-NLS-1$

-

 	/**

 	 * @generated

 	 */

-	public static final IElementType NamedElement_DefaultShape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.NamedElement_DefaultShape"); //$NON-NLS-1$

-

+	public static final IElementType NamedElement_DefaultShape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.NamedElement_DefaultShape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType DeploymentSpecification_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DeploymentSpecification_Shape"); //$NON-NLS-1$

-

+	public static final IElementType DeploymentSpecification_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.DeploymentSpecification_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Model_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Model_Shape_CN"); //$NON-NLS-1$

-

+	public static final IElementType Model_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Model_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Package_Shape_CN"); //$NON-NLS-1$

-

+	public static final IElementType Package_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Package_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Device_Shape_CCN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Device_Shape_CCN"); //$NON-NLS-1$

-

+	public static final IElementType Device_Shape_CCN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Device_Shape_CCN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Device_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Device_Shape_CN"); //$NON-NLS-1$

-

+	public static final IElementType Device_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Device_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType ExecutionEnvironment_Shape_CCN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CCN"); //$NON-NLS-1$

-

+	public static final IElementType ExecutionEnvironment_Shape_CCN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CCN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType ExecutionEnvironment_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CN"); //$NON-NLS-1$

-

+	public static final IElementType ExecutionEnvironment_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Node_Shape_CCN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Node_Shape_CCN"); //$NON-NLS-1$

-

+	public static final IElementType Node_Shape_CCN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Node_Shape_CCN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Node_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Node_Shape_CN"); //$NON-NLS-1$

-

+	public static final IElementType Node_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Node_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Artifact_Shape_CCN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Artifact_Shape_CCN"); //$NON-NLS-1$

-

+	public static final IElementType Artifact_Shape_CCN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Artifact_Shape_CCN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Artifact_Shape_ACN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Artifact_Shape_ACN"); //$NON-NLS-1$

-

+	public static final IElementType Artifact_Shape_ACN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Artifact_Shape_ACN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Artifact_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Artifact_Shape_CN"); //$NON-NLS-1$

-

+	public static final IElementType Artifact_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Artifact_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Comment_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Comment_Shape_CN"); //$NON-NLS-1$

-

+	public static final IElementType Comment_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Comment_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Constraint_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Constraint_Shape_CN"); //$NON-NLS-1$

-

+	public static final IElementType Constraint_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Constraint_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType DeploymentSpecification_Shape_CCN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CCN"); //$NON-NLS-1$

-

+	public static final IElementType DeploymentSpecification_Shape_CCN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CCN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType DeploymentSpecification_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CN"); //$NON-NLS-1$

-

+	public static final IElementType DeploymentSpecification_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType DeploymentSpecification_Shape_ACN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_ACN"); //$NON-NLS-1$

-

+	public static final IElementType DeploymentSpecification_Shape_ACN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_ACN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Link_DescriptorEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Link_DescriptorEdge"); //$NON-NLS-1$

-

+	public static final IElementType Link_DescriptorEdge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Link_DescriptorEdge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Comment_AnnotatedElementEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"); //$NON-NLS-1$

-

+	public static final IElementType Comment_AnnotatedElementEdge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Constraint_ConstrainedElementEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"); //$NON-NLS-1$

-

+	public static final IElementType Constraint_ConstrainedElementEdge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Deployment_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Deployment_Edge"); //$NON-NLS-1$

-

+	public static final IElementType Deployment_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Deployment_Edge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Manifestation_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Manifestation_Edge"); //$NON-NLS-1$

-

+	public static final IElementType Manifestation_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Manifestation_Edge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Generalization_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Generalization_Edge"); //$NON-NLS-1$

-

+	public static final IElementType Generalization_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Generalization_Edge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Dependency_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Dependency_Edge"); //$NON-NLS-1$

-

+	public static final IElementType Dependency_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Dependency_Edge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Dependency_BranchEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Dependency_BranchEdge"); //$NON-NLS-1$

-

+	public static final IElementType Dependency_BranchEdge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Dependency_BranchEdge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType CommunicationPath_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.CommunicationPath_Edge"); //$NON-NLS-1$

+	public static final IElementType CommunicationPath_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.CommunicationPath_Edge"); //$NON-NLS-1$

 

 	/**

 	 * @generated

@@ -305,117 +304,84 @@ public class UMLElementTypes {
 

 	/**

 	 * Returns 'type' of the ecore object associated with the hint.

-	 *

+	 * 

 	 * @generated

 	 */

 	public static synchronized ENamedElement getElement(IAdaptable hint) {

 		Object type = hint.getAdapter(IElementType.class);

 		if (elements == null) {

-			elements = new IdentityHashMap<>();

+			elements = new IdentityHashMap<IElementType, ENamedElement>();

 

 			elements.put(Package_DeploymentDiagram, UMLPackage.eINSTANCE.getPackage());

 

-

 			elements.put(Dependency_Shape, UMLPackage.eINSTANCE.getDependency());

 

-

 			elements.put(Model_Shape, UMLPackage.eINSTANCE.getModel());

 

-

 			elements.put(Package_Shape, UMLPackage.eINSTANCE.getPackage());

 

-

 			elements.put(Constraint_Shape, UMLPackage.eINSTANCE.getConstraint());

 

-

 			elements.put(Comment_Shape, UMLPackage.eINSTANCE.getComment());

 

-

 			elements.put(ExecutionEnvironment_Shape, UMLPackage.eINSTANCE.getExecutionEnvironment());

 

-

 			elements.put(Device_Shape, UMLPackage.eINSTANCE.getDevice());

 

-

 			elements.put(Artifact_Shape, UMLPackage.eINSTANCE.getArtifact());

 

-

 			elements.put(Node_Shape, UMLPackage.eINSTANCE.getNode());

 

-

 			elements.put(NamedElement_DefaultShape, UMLPackage.eINSTANCE.getNamedElement());

 

-

 			elements.put(DeploymentSpecification_Shape, UMLPackage.eINSTANCE.getDeploymentSpecification());

 

-

 			elements.put(Model_Shape_CN, UMLPackage.eINSTANCE.getModel());

 

-

 			elements.put(Package_Shape_CN, UMLPackage.eINSTANCE.getPackage());

 

-

 			elements.put(Device_Shape_CCN, UMLPackage.eINSTANCE.getDevice());

 

-

 			elements.put(Device_Shape_CN, UMLPackage.eINSTANCE.getDevice());

 

-

 			elements.put(ExecutionEnvironment_Shape_CCN, UMLPackage.eINSTANCE.getExecutionEnvironment());

 

-

 			elements.put(ExecutionEnvironment_Shape_CN, UMLPackage.eINSTANCE.getExecutionEnvironment());

 

-

 			elements.put(Node_Shape_CCN, UMLPackage.eINSTANCE.getNode());

 

-

 			elements.put(Node_Shape_CN, UMLPackage.eINSTANCE.getNode());

 

-

 			elements.put(Artifact_Shape_CCN, UMLPackage.eINSTANCE.getArtifact());

 

-

 			elements.put(Artifact_Shape_ACN, UMLPackage.eINSTANCE.getArtifact());

 

-

 			elements.put(Artifact_Shape_CN, UMLPackage.eINSTANCE.getArtifact());

 

-

 			elements.put(Comment_Shape_CN, UMLPackage.eINSTANCE.getComment());

 

-

 			elements.put(Constraint_Shape_CN, UMLPackage.eINSTANCE.getConstraint());

 

-

 			elements.put(DeploymentSpecification_Shape_CCN, UMLPackage.eINSTANCE.getDeploymentSpecification());

 

-

 			elements.put(DeploymentSpecification_Shape_CN, UMLPackage.eINSTANCE.getDeploymentSpecification());

 

-

 			elements.put(DeploymentSpecification_Shape_ACN, UMLPackage.eINSTANCE.getDeploymentSpecification());

 

 			elements.put(Comment_AnnotatedElementEdge, UMLPackage.eINSTANCE.getComment_AnnotatedElement());

 

 			elements.put(Constraint_ConstrainedElementEdge, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());

 

-

 			elements.put(Deployment_Edge, UMLPackage.eINSTANCE.getDeployment());

 

-

 			elements.put(Manifestation_Edge, UMLPackage.eINSTANCE.getManifestation());

 

-

 			elements.put(Generalization_Edge, UMLPackage.eINSTANCE.getGeneralization());

 

-

 			elements.put(Dependency_Edge, UMLPackage.eINSTANCE.getDependency());

 

-

 			elements.put(Dependency_BranchEdge, UMLPackage.eINSTANCE.getDependency());

 

-

 			elements.put(CommunicationPath_Edge, UMLPackage.eINSTANCE.getCommunicationPath());

 		}

 		return elements.get(type);

@@ -431,6 +397,63 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

+	public static synchronized boolean isKnownElementType(IElementType elementType) {

+		if (KNOWN_ELEMENT_TYPES == null) {

+			KNOWN_ELEMENT_TYPES = new HashSet<IElementType>();

+			KNOWN_ELEMENT_TYPES.add(Package_DeploymentDiagram);

+			KNOWN_ELEMENT_TYPES.add(Dependency_Shape);

+			KNOWN_ELEMENT_TYPES.add(Model_Shape);

+			KNOWN_ELEMENT_TYPES.add(Package_Shape);

+			KNOWN_ELEMENT_TYPES.add(Constraint_Shape);

+			KNOWN_ELEMENT_TYPES.add(Comment_Shape);

+			KNOWN_ELEMENT_TYPES.add(ExecutionEnvironment_Shape);

+			KNOWN_ELEMENT_TYPES.add(Device_Shape);

+			KNOWN_ELEMENT_TYPES.add(Artifact_Shape);

+			KNOWN_ELEMENT_TYPES.add(Node_Shape);

+			KNOWN_ELEMENT_TYPES.add(NamedElement_DefaultShape);

+			KNOWN_ELEMENT_TYPES.add(DeploymentSpecification_Shape);

+			KNOWN_ELEMENT_TYPES.add(Model_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(Package_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(Device_Shape_CCN);

+			KNOWN_ELEMENT_TYPES.add(Device_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(ExecutionEnvironment_Shape_CCN);

+			KNOWN_ELEMENT_TYPES.add(ExecutionEnvironment_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(Node_Shape_CCN);

+			KNOWN_ELEMENT_TYPES.add(Node_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(Artifact_Shape_CCN);

+			KNOWN_ELEMENT_TYPES.add(Artifact_Shape_ACN);

+			KNOWN_ELEMENT_TYPES.add(Artifact_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(Comment_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(Constraint_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(DeploymentSpecification_Shape_CCN);

+			KNOWN_ELEMENT_TYPES.add(DeploymentSpecification_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(DeploymentSpecification_Shape_ACN);

+			KNOWN_ELEMENT_TYPES.add(Link_DescriptorEdge);

+			KNOWN_ELEMENT_TYPES.add(Comment_AnnotatedElementEdge);

+			KNOWN_ELEMENT_TYPES.add(Constraint_ConstrainedElementEdge);

+			KNOWN_ELEMENT_TYPES.add(Deployment_Edge);

+			KNOWN_ELEMENT_TYPES.add(Manifestation_Edge);

+			KNOWN_ELEMENT_TYPES.add(Generalization_Edge);

+			KNOWN_ELEMENT_TYPES.add(Dependency_Edge);

+			KNOWN_ELEMENT_TYPES.add(Dependency_BranchEdge);

+			KNOWN_ELEMENT_TYPES.add(CommunicationPath_Edge);

+		}

+

+		boolean result = KNOWN_ELEMENT_TYPES.contains(elementType);

+

+		if (!result) {

+			IElementType[] supertypes = elementType.getAllSuperTypes();

+			for (int i = 0; !result && (i < supertypes.length); i++) {

+				result = KNOWN_ELEMENT_TYPES.contains(supertypes[i]);

+			}

+		}

+

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

 	public static IElementType getElementType(String visualID) {

 		if (visualID != null) {

 			switch (visualID) {

@@ -516,63 +539,6 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	public static synchronized boolean isKnownElementType(IElementType elementType) {

-		if (KNOWN_ELEMENT_TYPES == null) {

-			KNOWN_ELEMENT_TYPES = new HashSet<>();

-			KNOWN_ELEMENT_TYPES.add(Package_DeploymentDiagram);

-			KNOWN_ELEMENT_TYPES.add(Dependency_Shape);

-			KNOWN_ELEMENT_TYPES.add(Model_Shape);

-			KNOWN_ELEMENT_TYPES.add(Package_Shape);

-			KNOWN_ELEMENT_TYPES.add(Constraint_Shape);

-			KNOWN_ELEMENT_TYPES.add(Comment_Shape);

-			KNOWN_ELEMENT_TYPES.add(ExecutionEnvironment_Shape);

-			KNOWN_ELEMENT_TYPES.add(Device_Shape);

-			KNOWN_ELEMENT_TYPES.add(Artifact_Shape);

-			KNOWN_ELEMENT_TYPES.add(Node_Shape);

-			KNOWN_ELEMENT_TYPES.add(NamedElement_DefaultShape);

-			KNOWN_ELEMENT_TYPES.add(DeploymentSpecification_Shape);

-			KNOWN_ELEMENT_TYPES.add(Model_Shape_CN);

-			KNOWN_ELEMENT_TYPES.add(Package_Shape_CN);

-			KNOWN_ELEMENT_TYPES.add(Device_Shape_CCN);

-			KNOWN_ELEMENT_TYPES.add(Device_Shape_CN);

-			KNOWN_ELEMENT_TYPES.add(ExecutionEnvironment_Shape_CCN);

-			KNOWN_ELEMENT_TYPES.add(ExecutionEnvironment_Shape_CN);

-			KNOWN_ELEMENT_TYPES.add(Node_Shape_CCN);

-			KNOWN_ELEMENT_TYPES.add(Node_Shape_CN);

-			KNOWN_ELEMENT_TYPES.add(Artifact_Shape_CCN);

-			KNOWN_ELEMENT_TYPES.add(Artifact_Shape_ACN);

-			KNOWN_ELEMENT_TYPES.add(Artifact_Shape_CN);

-			KNOWN_ELEMENT_TYPES.add(Comment_Shape_CN);

-			KNOWN_ELEMENT_TYPES.add(Constraint_Shape_CN);

-			KNOWN_ELEMENT_TYPES.add(DeploymentSpecification_Shape_CCN);

-			KNOWN_ELEMENT_TYPES.add(DeploymentSpecification_Shape_CN);

-			KNOWN_ELEMENT_TYPES.add(DeploymentSpecification_Shape_ACN);

-			KNOWN_ELEMENT_TYPES.add(Link_DescriptorEdge);

-			KNOWN_ELEMENT_TYPES.add(Comment_AnnotatedElementEdge);

-			KNOWN_ELEMENT_TYPES.add(Constraint_ConstrainedElementEdge);

-			KNOWN_ELEMENT_TYPES.add(Deployment_Edge);

-			KNOWN_ELEMENT_TYPES.add(Manifestation_Edge);

-			KNOWN_ELEMENT_TYPES.add(Generalization_Edge);

-			KNOWN_ELEMENT_TYPES.add(Dependency_Edge);

-			KNOWN_ELEMENT_TYPES.add(Dependency_BranchEdge);

-			KNOWN_ELEMENT_TYPES.add(CommunicationPath_Edge);

-		}

-

-		boolean result = KNOWN_ELEMENT_TYPES.contains(elementType);

-

-		if (!result) {

-			IElementType[] supertypes = elementType.getAllSuperTypes();

-			for (int i = 0; !result && (i < supertypes.length); i++) {

-				result = KNOWN_ELEMENT_TYPES.contains(supertypes[i]);

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

 	public static final DiagramElementTypes TYPED_INSTANCE = new DiagramElementTypes(elementTypeImages) {

 

 		/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLMarkerNavigationProvider.java
index f8c4644cfab..3211eeed51c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLMarkerNavigationProvider.java
@@ -53,8 +53,7 @@ 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 }));

 		}

 	}

 

@@ -65,8 +64,7 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr
 		try {

 			resource.deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_ZERO);

 		} catch (CoreException e) {

-			UMLDiagramEditorPlugin.getInstance().logError(

-					"Failed to delete validation markers", e); //$NON-NLS-1$

+			UMLDiagramEditorPlugin.getInstance().logError("Failed to delete validation markers", e); //$NON-NLS-1$

 		}

 	}

 

@@ -83,14 +81,12 @@ 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);

 		} catch (CoreException e) {

-			UMLDiagramEditorPlugin.getInstance().logError(

-					"Failed to create validation marker", e); //$NON-NLS-1$

+			UMLDiagramEditorPlugin.getInstance().logError("Failed to create validation marker", e); //$NON-NLS-1$

 		}

 		return marker;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLParserProvider.java
index d21937ebe27..c6d8b5a9d7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLParserProvider.java
@@ -90,9 +90,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDependency_MultiNameLabel_Parser() {

 		if (dependency_MultiNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			dependency_MultiNameLabel_Parser = parser;

 		}

@@ -109,9 +107,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getModel_NameLabel_Parser() {

 		if (model_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			model_NameLabel_Parser = parser;

 		}

@@ -128,9 +124,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getPackage_NameLabel_Parser() {

 		if (package_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			package_NameLabel_Parser = parser;

 		}

@@ -147,9 +141,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConstraint_NameLabel_Parser() {

 		if (constraint_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			constraint_NameLabel_Parser = parser;

 		}

@@ -196,9 +188,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getExecutionEnvironment_NameLabel_Parser() {

 		if (executionEnvironment_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			executionEnvironment_NameLabel_Parser = parser;

 		}

@@ -215,9 +205,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDevice_NameLabel_Parser() {

 		if (device_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			device_NameLabel_Parser = parser;

 		}

@@ -234,9 +222,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getArtifact_NameLabel_Parser() {

 		if (artifact_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			artifact_NameLabel_Parser = parser;

 		}

@@ -253,9 +239,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getArtifact_FloatingNameLabel_Parser() {

 		if (artifact_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			artifact_FloatingNameLabel_Parser = parser;

 		}

@@ -272,9 +256,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getNode_NameLabel_Parser() {

 		if (node_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			node_NameLabel_Parser = parser;

 		}

@@ -291,9 +273,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getNamedElement_NameLabel_Parser() {

 		if (namedElement_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			namedElement_NameLabel_Parser = parser;

 		}

@@ -310,9 +290,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeploymentSpecification_NameLabel_Parser() {

 		if (deploymentSpecification_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deploymentSpecification_NameLabel_Parser = parser;

 		}

@@ -329,9 +307,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeploymentSpecification_FloatingNameLabel_Parser() {

 		if (deploymentSpecification_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deploymentSpecification_FloatingNameLabel_Parser = parser;

 		}

@@ -348,9 +324,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getModel_NameLabel_CN_Parser() {

 		if (model_NameLabel_CN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			model_NameLabel_CN_Parser = parser;

 		}

@@ -367,9 +341,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getPackage_NameLabel_CN_Parser() {

 		if (package_NameLabel_CN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			package_NameLabel_CN_Parser = parser;

 		}

@@ -386,9 +358,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDevice_NameLabel_CCN_Parser() {

 		if (device_NameLabel_CCN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			device_NameLabel_CCN_Parser = parser;

 		}

@@ -405,9 +375,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDevice_NameLabel_CN_Parser() {

 		if (device_NameLabel_CN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			device_NameLabel_CN_Parser = parser;

 		}

@@ -424,9 +392,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getExecutionEnvironment_NameLabel_CCN_Parser() {

 		if (executionEnvironment_NameLabel_CCN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			executionEnvironment_NameLabel_CCN_Parser = parser;

 		}

@@ -443,9 +409,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getExecutionEnvironment_NameLabel_CN_Parser() {

 		if (executionEnvironment_NameLabel_CN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			executionEnvironment_NameLabel_CN_Parser = parser;

 		}

@@ -462,9 +426,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getNode_NameLabel_CCN_Parser() {

 		if (node_NameLabel_CCN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			node_NameLabel_CCN_Parser = parser;

 		}

@@ -481,9 +443,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getNode_NameLabel_CN_Parser() {

 		if (node_NameLabel_CN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			node_NameLabel_CN_Parser = parser;

 		}

@@ -500,9 +460,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getArtifact_NameLabel_CCN_Parser() {

 		if (artifact_NameLabel_CCN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			artifact_NameLabel_CCN_Parser = parser;

 		}

@@ -519,9 +477,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getArtifact_FloatingNameLabel_CCN_Parser() {

 		if (artifact_FloatingNameLabel_CCN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			artifact_FloatingNameLabel_CCN_Parser = parser;

 		}

@@ -538,9 +494,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getArtifact_NameLabel_ACN_Parser() {

 		if (artifact_NameLabel_ACN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			artifact_NameLabel_ACN_Parser = parser;

 		}

@@ -557,9 +511,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getArtifact_FloatingNameLabel_ACN_Parser() {

 		if (artifact_FloatingNameLabel_ACN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			artifact_FloatingNameLabel_ACN_Parser = parser;

 		}

@@ -576,9 +528,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getArtifact_NameLabel_CN_Parser() {

 		if (artifact_NameLabel_CN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			artifact_NameLabel_CN_Parser = parser;

 		}

@@ -610,9 +560,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConstraint_NameLabel_CN_Parser() {

 		if (constraint_NameLabel_CN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			constraint_NameLabel_CN_Parser = parser;

 		}

@@ -644,9 +592,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeploymentSpecification_NameLabel_CCN_Parser() {

 		if (deploymentSpecification_NameLabel_CCN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deploymentSpecification_NameLabel_CCN_Parser = parser;

 		}

@@ -663,9 +609,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeploymentSpecification_FloatingNameLabel_CCN_Parser() {

 		if (deploymentSpecification_FloatingNameLabel_CCN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deploymentSpecification_FloatingNameLabel_CCN_Parser = parser;

 		}

@@ -682,9 +626,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeploymentSpecification_NameLabel_CN_Parser() {

 		if (deploymentSpecification_NameLabel_CN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deploymentSpecification_NameLabel_CN_Parser = parser;

 		}

@@ -701,9 +643,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeploymentSpecification_FloatingNameLabel_CN_Parser() {

 		if (deploymentSpecification_FloatingNameLabel_CN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deploymentSpecification_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -720,9 +660,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeploymentSpecification_NameLabel_ACN_Parser() {

 		if (deploymentSpecification_NameLabel_ACN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deploymentSpecification_NameLabel_ACN_Parser = parser;

 		}

@@ -739,9 +677,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeploymentSpecification_FloatingNameLabel_ACN_Parser() {

 		if (deploymentSpecification_FloatingNameLabel_ACN_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deploymentSpecification_FloatingNameLabel_ACN_Parser = parser;

 		}

@@ -758,9 +694,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeployment_NameLabel_Parser() {

 		if (deployment_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deployment_NameLabel_Parser = parser;

 		}

@@ -792,9 +726,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getManifestation_NameLabel_Parser() {

 		if (manifestation_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			manifestation_NameLabel_Parser = parser;

 		}

@@ -841,9 +773,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDependency_NameLabel_Parser() {

 		if (dependency_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			dependency_NameLabel_Parser = parser;

 		}

@@ -875,9 +805,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCommunicationPath_NameLabel_Parser() {

 		if (communicationPath_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			communicationPath_NameLabel_Parser = parser;

 		}

@@ -1004,9 +932,6 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 			case DeploymentSpecAsNestedArtifactFloatingLabelEditPart.VISUAL_ID:

 				return getDeploymentSpecification_FloatingNameLabel_ACN_Parser();

 

-

-

-

 			case DeploymentNameEditPart.VISUAL_ID:

 				return getDeployment_NameLabel_Parser();

 			case DeploymentAppliedStereotypeEditPart.VISUAL_ID:

@@ -1025,7 +950,6 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 			case DependencyAppliedStereotypeEditPart.VISUAL_ID:

 				return getDependency_StereotypeLabel_Parser();

 

-

 			case CommunicationPathNameEditPart.VISUAL_ID:

 				return getCommunicationPath_NameLabel_Parser();

 			case CommunicationPathAppliedStereotypeEditPart.VISUAL_ID:

@@ -1050,11 +974,11 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	@Override

 	public IParser getParser(IAdaptable hint) {

-		String vid = hint.getAdapter(String.class);

+		String vid = (String) hint.getAdapter(String.class);

 		if (vid != null) {

 			return getParser(UMLVisualIDRegistry.getVisualID(vid));

 		}

-		View view = hint.getAdapter(View.class);

+		View view = (View) hint.getAdapter(View.class);

 		if (view != null) {

 			return getParser(UMLVisualIDRegistry.getVisualID(view));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLValidationDecoratorProvider.java
index 2b29bbd6345..cdc7f088454 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLValidationDecoratorProvider.java
@@ -37,9 +37,8 @@ public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider
 	 */

 	@Override

 	public void createDecorators(IDecoratorTarget decoratorTarget) {

-		EditPart editPart = decoratorTarget.getAdapter(EditPart.class);

-		if (editPart instanceof GraphicalEditPart ||

-				editPart instanceof AbstractConnectionEditPart) {

+		EditPart editPart = (EditPart) decoratorTarget.getAdapter(EditPart.class);

+		if (editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) {

 			Object model = editPart.getModel();

 			if ((model instanceof View)) {

 				View view = (View) model;

@@ -66,8 +65,7 @@ public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider
 			return false;

 		}

 		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget();

-		View view = decoratorTarget.getAdapter(

-				View.class);

+		View view = (View) decoratorTarget.getAdapter(View.class);

 		return view != null && DeploymentDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLValidationProvider.java
index 7709f8754f8..6796332c6db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLValidationProvider.java
@@ -69,7 +69,8 @@ public class UMLValidationProvider {
 			return false;

 		}

 		if (object instanceof View) {

-			return constraintsActive && DeploymentDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View) object));

+			return constraintsActive

+					&& DeploymentDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View) object));

 		}

 		return true;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java
index 6c2b5dcd784..8d4297f47d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java
@@ -183,11 +183,11 @@ 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());

@@ -208,13 +208,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */

 	protected String getDiagramProvidedId() {

 		/*

-		 * Indicates for which diagram this provider works for.

-		 * <p>

-		 * This method can be overloaded when diagram editor inherits from another one, but should never be <code>null</code>

-		 * </p>

-		 *

-		 * @return the unique identifier of the diagram for which views are provided.

-		 */

+		* Indicates for which diagram this provider works for.

+		* <p>

+		* This method can be overloaded when diagram editor inherits from another one, but should never be <code>null</code>

+		* </p>

+		* 

+		* @return the unique identifier of the diagram for which views are provided.

+		*/

 		return DeploymentDiagramEditPart.MODEL_ID;

 	}

 

@@ -222,7 +222,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected boolean provides(CreateDiagramViewOperation op) {

-		return DeploymentDiagramEditPart.MODEL_ID.equals(op.getSemanticHint()) && UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != null

+		return DeploymentDiagramEditPart.MODEL_ID.equals(op.getSemanticHint())

+				&& UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != null

 				&& !UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())).isEmpty();

 	}

 

@@ -256,9 +257,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				if (!op.getSemanticHint().equals(elementTypeHint)) {

 					return false; // if semantic hint is specified it should be the same as in element type

 				}

-				// if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) {

-				// return false; // visual id for node EClass should match visual id from element type

-				// }

+				//if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) {

+				//	return false; // visual id for node EClass should match visual id from element type

+				//}

 			} else {

 				if (!DeploymentDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) {

 					return false; // foreign diagram

@@ -292,7 +293,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 					case ArtifactEditPartCN.VISUAL_ID:

 					case ArtifactEditPartACN.VISUAL_ID:

 					case NestedArtifactNodeEditPartCN.VISUAL_ID:

-						if (domainElement == null || !visualID.equals(UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) {

+						if (domainElement == null || !visualID

+								.equals(UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) {

 							return false; // visual id in semantic hint should match visual id for domain element

 						}

 						break;

@@ -317,14 +319,15 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		}

 

 		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();

-		if (elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {

+		if (elementTypeHint == null

+				|| (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {

 			return false; // our hint is visual id and must be specified, and it should be the same as in element type

 		}

-		// String visualID = org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.getVisualID(elementTypeHint);

-		// org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter());

-		// if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.getLinkWithClassVisualID(domainElement))) {

-		// return false; // visual id for link EClass should match visual id from element type

-		// }

+		//String visualID = org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.getVisualID(elementTypeHint);

+		//org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter());

+		//if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry.getLinkWithClassVisualID(domainElement))) {

+		//	return false; // visual id for link EClass should match visual id from element type

+		//}

 		return true;

 	}

 

@@ -347,7 +350,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	@Override

-	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		final EObject domainElement = getSemanticElement(semanticAdapter);

 		final String visualID;

 		if (semanticHint == null) {

@@ -368,7 +372,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case CommentEditPart.VISUAL_ID:

 				return createComment_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case ExecutionEnvironmentEditPart.VISUAL_ID:

-				return createExecutionEnvironment_Shape(domainElement, containerView, index, persisted, preferencesHint);

+				return createExecutionEnvironment_Shape(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case DeviceEditPart.VISUAL_ID:

 				return createDevice_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case ArtifactEditPart.VISUAL_ID:

@@ -378,7 +383,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case DefaultNamedElementEditPart.VISUAL_ID:

 				return createNamedElement_DefaultShape(domainElement, containerView, index, persisted, preferencesHint);

 			case DeploymentSpecificationEditPart.VISUAL_ID:

-				return createDeploymentSpecification_Shape(domainElement, containerView, index, persisted, preferencesHint);

+				return createDeploymentSpecification_Shape(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case ModelEditPartCN.VISUAL_ID:

 				return createModel_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case PackageEditPartCN.VISUAL_ID:

@@ -388,9 +394,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case NestedDeviceEditPartCN.VISUAL_ID:

 				return createDevice_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case ExecutionEnvironmentEditPartCN.VISUAL_ID:

-				return createExecutionEnvironment_Shape_CCN(domainElement, containerView, index, persisted, preferencesHint);

+				return createExecutionEnvironment_Shape_CCN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case NestedExecutionEnvironmentEditPartCN.VISUAL_ID:

-				return createExecutionEnvironment_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

+				return createExecutionEnvironment_Shape_CN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case NodeEditPartCN.VISUAL_ID:

 				return createNode_Shape_CCN(domainElement, containerView, index, persisted, preferencesHint);

 			case NestedNodeEditPartCN.VISUAL_ID:

@@ -406,11 +414,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case ConstraintEditPartCN.VISUAL_ID:

 				return createConstraint_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case DeploymentSpecAsClassifierEditPart.VISUAL_ID:

-				return createDeploymentSpecification_Shape_CCN(domainElement, containerView, index, persisted, preferencesHint);

+				return createDeploymentSpecification_Shape_CCN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case DeploymentSpecAsPackageableElEditPart.VISUAL_ID:

-				return createDeploymentSpecification_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

+				return createDeploymentSpecification_Shape_CN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case DeploymentSpecAsNestedArtifactEditPart.VISUAL_ID:

-				return createDeploymentSpecification_Shape_ACN(domainElement, containerView, index, persisted, preferencesHint);

+				return createDeploymentSpecification_Shape_ACN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			}

 		}

 		// can't happen, provided #provides(CreateNodeViewOperation) is correct

@@ -421,7 +432,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	@Override

-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		IElementType elementType = getSemanticElementType(semanticAdapter);

 		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();

 		String vid = UMLVisualIDRegistry.getVisualID(elementTypeHint);

@@ -434,17 +446,23 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case ConstraintConstrainedElementEditPart.VISUAL_ID:

 				return createConstraint_ConstrainedElementEdge(containerView, index, persisted, preferencesHint);

 			case DeploymentEditPart.VISUAL_ID:

-				return createDeployment_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createDeployment_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted,

+						preferencesHint);

 			case ManifestationEditPart.VISUAL_ID:

-				return createManifestation_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createManifestation_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted,

+						preferencesHint);

 			case GeneralizationEditPart.VISUAL_ID:

-				return createGeneralization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createGeneralization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted,

+						preferencesHint);

 			case DependencyEditPart.VISUAL_ID:

-				return createDependency_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createDependency_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted,

+						preferencesHint);

 			case DependencyBranchEditPart.VISUAL_ID:

-				return createDependency_BranchEdge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createDependency_BranchEdge(getSemanticElement(semanticAdapter), containerView, index, persisted,

+						preferencesHint);

 			case CommunicationPathEditPart.VISUAL_ID:

-				return createCommunicationPath_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createCommunicationPath_Edge(getSemanticElement(semanticAdapter), containerView, index,

+						persisted, preferencesHint);

 			}

 		}

 		// can never happen, provided #provides(CreateEdgeViewOperation) is correct

@@ -454,41 +472,45 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDependency_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDependency_Shape(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(DependencyNodeEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DependencyNode");

-		Node dependency_MultiNameLabel = createLabel(node, UMLVisualIDRegistry.getType(MultiDependencyLabelEditPart.VISUAL_ID));

+		Node dependency_MultiNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(MultiDependencyLabelEditPart.VISUAL_ID));

 		dependency_MultiNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location dependency_MultiNameLabel_Location = (Location) dependency_MultiNameLabel.getLayoutConstraint();

 		dependency_MultiNameLabel_Location.setX(0);

-		dependency_MultiNameLabel_Location.setY(5);

+		dependency_MultiNameLabel_Location.setY(15);

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createModel_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createModel_Shape(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(ModelEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Model");

 		Node model_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ModelNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPart.VISUAL_ID), false, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPart.VISUAL_ID),

+				false, true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Model");

 		return node;

 	}

@@ -496,19 +518,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createPackage_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createPackage_Shape(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(PackageEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Package");

 		Node package_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(PackageNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPart.VISUAL_ID), false, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPart.VISUAL_ID),

+				false, true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Package");

 		return node;

 	}

@@ -516,33 +540,36 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createConstraint_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createConstraint_Shape(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(ConstraintEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint");

 		Node constraint_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));

-		Node constraint_BodyLabel = createLabel(node, UMLVisualIDRegistry.getType(ConstraintSpecificationEditPart.VISUAL_ID));

+		Node constraint_BodyLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ConstraintSpecificationEditPart.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createComment_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createComment_Shape(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(CommentEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment");

@@ -553,19 +580,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createExecutionEnvironment_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createExecutionEnvironment_Shape(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(ExecutionEnvironmentEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ExecutionEnvironment");

-		Node executionEnvironment_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID), false, true, false, false);

+		Node executionEnvironment_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ExecutionEnvironmentNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID),

+				false, true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ExecutionEnvironment");

 		return node;

 	}

@@ -573,19 +603,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDevice_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDevice_Shape(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(DeviceEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Device");

 		Node device_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(DeviceNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPart.VISUAL_ID), false, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPart.VISUAL_ID), false, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Device");

 		return node;

 	}

@@ -593,24 +625,27 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createArtifact_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createArtifact_Shape(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(ArtifactEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Artifact");

 		Node artifact_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ArtifactNameEditPart.VISUAL_ID));

-		Node artifact_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(ArtifactFloatingLabelEditPart.VISUAL_ID));

+		Node artifact_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ArtifactFloatingLabelEditPart.VISUAL_ID));

 		artifact_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location artifact_FloatingNameLabel_Location = (Location) artifact_FloatingNameLabel.getLayoutConstraint();

 		artifact_FloatingNameLabel_Location.setX(25);

 		artifact_FloatingNameLabel_Location.setY(0);

-		createCompartment(node, UMLVisualIDRegistry.getType(ArtifactCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ArtifactCompositeCompartmentEditPart.VISUAL_ID), true, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Artifact");

 		return node;

 	}

@@ -618,19 +653,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createNode_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createNode_Shape(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Node");

 		Node node_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(NodeNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPart.VISUAL_ID), false, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPart.VISUAL_ID), false, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Node");

 		return node;

 	}

@@ -638,39 +675,45 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createNamedElement_DefaultShape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createNamedElement_DefaultShape(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(DefaultNamedElementEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DefaultNamedElement");

-		Node namedElement_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(DefaultNamedElementNameEditPart.VISUAL_ID));

+		Node namedElement_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DefaultNamedElementNameEditPart.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createDeploymentSpecification_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDeploymentSpecification_Shape(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(DeploymentSpecificationEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DeploymentSpecification");

-		Node deploymentSpecification_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPart.VISUAL_ID));

-		Node deploymentSpecification_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID));

+		Node deploymentSpecification_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPart.VISUAL_ID));

+		Node deploymentSpecification_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID));

 		deploymentSpecification_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location deploymentSpecification_FloatingNameLabel_Location = (Location) deploymentSpecification_FloatingNameLabel.getLayoutConstraint();

+		Location deploymentSpecification_FloatingNameLabel_Location = (Location) deploymentSpecification_FloatingNameLabel

+				.getLayoutConstraint();

 		deploymentSpecification_FloatingNameLabel_Location.setX(25);

 		deploymentSpecification_FloatingNameLabel_Location.setY(0);

 		return node;

@@ -679,18 +722,20 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createModel_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createModel_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(ModelEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Model");

 		Node model_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ModelNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPartCN.VISUAL_ID), false, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPartCN.VISUAL_ID),

+				false, true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Model");

 		return node;

 	}

@@ -698,18 +743,20 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createPackage_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createPackage_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(PackageEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Package");

 		Node package_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(PackageNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPartCN.VISUAL_ID), false, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPartCN.VISUAL_ID),

+				false, true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Package");

 		return node;

 	}

@@ -717,13 +764,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDevice_Shape_CCN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDevice_Shape_CCN(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(DeviceEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Device");

@@ -734,18 +782,20 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDevice_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDevice_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(NestedDeviceEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Device");

 		Node device_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(NestedDeviceNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPartCN.VISUAL_ID), true, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Device");

 		return node;

 	}

@@ -753,35 +803,41 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createExecutionEnvironment_Shape_CCN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createExecutionEnvironment_Shape_CCN(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(ExecutionEnvironmentEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ExecutionEnvironment");

-		Node executionEnvironment_NameLabel_CCN = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentNameEditPartCN.VISUAL_ID));

+		Node executionEnvironment_NameLabel_CCN = createLabel(node,

+				UMLVisualIDRegistry.getType(ExecutionEnvironmentNameEditPartCN.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createExecutionEnvironment_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createExecutionEnvironment_Shape_CN(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(NestedExecutionEnvironmentEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ExecutionEnvironment");

-		Node executionEnvironment_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(NestedExecutionEnvironmentNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		Node executionEnvironment_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(NestedExecutionEnvironmentNameEditPartCN.VISUAL_ID));

+		createCompartment(node,

+				UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID), true, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ExecutionEnvironment");

 		return node;

 	}

@@ -789,13 +845,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createNode_Shape_CCN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createNode_Shape_CCN(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(NodeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Node");

@@ -806,18 +863,20 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createNode_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createNode_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(NestedNodeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Node");

 		Node node_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(NestedNodeNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPartCN.VISUAL_ID), true, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Node");

 		return node;

 	}

@@ -825,23 +884,27 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createArtifact_Shape_CCN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createArtifact_Shape_CCN(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(ArtifactEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Artifact");

 		Node artifact_NameLabel_CCN = createLabel(node, UMLVisualIDRegistry.getType(ArtifactNameEditPartCN.VISUAL_ID));

-		Node artifact_FloatingNameLabel_CCN = createLabel(node, UMLVisualIDRegistry.getType(ArtifactFloatingLabelEditPartCN.VISUAL_ID));

+		Node artifact_FloatingNameLabel_CCN = createLabel(node,

+				UMLVisualIDRegistry.getType(ArtifactFloatingLabelEditPartCN.VISUAL_ID));

 		artifact_FloatingNameLabel_CCN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location artifact_FloatingNameLabel_CCN_Location = (Location) artifact_FloatingNameLabel_CCN.getLayoutConstraint();

+		Location artifact_FloatingNameLabel_CCN_Location = (Location) artifact_FloatingNameLabel_CCN

+				.getLayoutConstraint();

 		artifact_FloatingNameLabel_CCN_Location.setX(25);

 		artifact_FloatingNameLabel_CCN_Location.setY(0);

-		createCompartment(node, UMLVisualIDRegistry.getType(ArtifactCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ArtifactCompositeCompartmentEditPartCN.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Artifact");

 		return node;

 	}

@@ -849,23 +912,27 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createArtifact_Shape_ACN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createArtifact_Shape_ACN(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(ArtifactEditPartACN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Artifact");

 		Node artifact_NameLabel_ACN = createLabel(node, UMLVisualIDRegistry.getType(ArtifactNameEditPartACN.VISUAL_ID));

-		Node artifact_FloatingNameLabel_ACN = createLabel(node, UMLVisualIDRegistry.getType(ArtifactFloatingLabelEditPartACN.VISUAL_ID));

+		Node artifact_FloatingNameLabel_ACN = createLabel(node,

+				UMLVisualIDRegistry.getType(ArtifactFloatingLabelEditPartACN.VISUAL_ID));

 		artifact_FloatingNameLabel_ACN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location artifact_FloatingNameLabel_ACN_Location = (Location) artifact_FloatingNameLabel_ACN.getLayoutConstraint();

+		Location artifact_FloatingNameLabel_ACN_Location = (Location) artifact_FloatingNameLabel_ACN

+				.getLayoutConstraint();

 		artifact_FloatingNameLabel_ACN_Location.setX(25);

 		artifact_FloatingNameLabel_ACN_Location.setY(0);

-		createCompartment(node, UMLVisualIDRegistry.getType(ArtifactCompositeCompartmentEditPartACN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ArtifactCompositeCompartmentEditPartACN.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Artifact");

 		return node;

 	}

@@ -873,30 +940,33 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createArtifact_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createArtifact_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(NestedArtifactNodeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Artifact");

-		Node artifact_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(NestedArtifactNameEditPart.VISUAL_ID));

+		Node artifact_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(NestedArtifactNameEditPart.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createComment_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createComment_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(CommentEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment");

@@ -907,38 +977,45 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createConstraint_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createConstraint_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(ConstraintEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint");

-		Node constraint_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID));

-		Node constraint_BodyLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ConstraintSpecificationEditPartCN.VISUAL_ID));

+		Node constraint_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID));

+		Node constraint_BodyLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ConstraintSpecificationEditPartCN.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createDeploymentSpecification_Shape_CCN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDeploymentSpecification_Shape_CCN(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(DeploymentSpecAsClassifierEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DeploymentSpecification");

-		Node deploymentSpecification_NameLabel_CCN = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecAsClassifierNameEditPart.VISUAL_ID));

-		Node deploymentSpecification_FloatingNameLabel_CCN = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecAsClassifierFloatingLabelEditPart.VISUAL_ID));

+		Node deploymentSpecification_NameLabel_CCN = createLabel(node,

+				UMLVisualIDRegistry.getType(DeploymentSpecAsClassifierNameEditPart.VISUAL_ID));

+		Node deploymentSpecification_FloatingNameLabel_CCN = createLabel(node,

+				UMLVisualIDRegistry.getType(DeploymentSpecAsClassifierFloatingLabelEditPart.VISUAL_ID));

 		deploymentSpecification_FloatingNameLabel_CCN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location deploymentSpecification_FloatingNameLabel_CCN_Location = (Location) deploymentSpecification_FloatingNameLabel_CCN.getLayoutConstraint();

+		Location deploymentSpecification_FloatingNameLabel_CCN_Location = (Location) deploymentSpecification_FloatingNameLabel_CCN

+				.getLayoutConstraint();

 		deploymentSpecification_FloatingNameLabel_CCN_Location.setX(25);

 		deploymentSpecification_FloatingNameLabel_CCN_Location.setY(0);

 		return node;

@@ -947,20 +1024,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDeploymentSpecification_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDeploymentSpecification_Shape_CN(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(DeploymentSpecAsPackageableElEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DeploymentSpecification");

-		Node deploymentSpecification_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecAsPackageableElNameEditPart.VISUAL_ID));

-		Node deploymentSpecification_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecAsPackageableElFloatingLabelEditPart.VISUAL_ID));

+		Node deploymentSpecification_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(DeploymentSpecAsPackageableElNameEditPart.VISUAL_ID));

+		Node deploymentSpecification_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(DeploymentSpecAsPackageableElFloatingLabelEditPart.VISUAL_ID));

 		deploymentSpecification_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location deploymentSpecification_FloatingNameLabel_CN_Location = (Location) deploymentSpecification_FloatingNameLabel_CN.getLayoutConstraint();

+		Location deploymentSpecification_FloatingNameLabel_CN_Location = (Location) deploymentSpecification_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		deploymentSpecification_FloatingNameLabel_CN_Location.setX(25);

 		deploymentSpecification_FloatingNameLabel_CN_Location.setY(0);

 		return node;

@@ -969,20 +1050,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDeploymentSpecification_Shape_ACN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDeploymentSpecification_Shape_ACN(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(DeploymentSpecAsNestedArtifactEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DeploymentSpecification");

-		Node deploymentSpecification_NameLabel_ACN = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecAsNestedArtifactNameEditPart.VISUAL_ID));

-		Node deploymentSpecification_FloatingNameLabel_ACN = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecAsNestedArtifactFloatingLabelEditPart.VISUAL_ID));

+		Node deploymentSpecification_NameLabel_ACN = createLabel(node,

+				UMLVisualIDRegistry.getType(DeploymentSpecAsNestedArtifactNameEditPart.VISUAL_ID));

+		Node deploymentSpecification_FloatingNameLabel_ACN = createLabel(node,

+				UMLVisualIDRegistry.getType(DeploymentSpecAsNestedArtifactFloatingLabelEditPart.VISUAL_ID));

 		deploymentSpecification_FloatingNameLabel_ACN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location deploymentSpecification_FloatingNameLabel_ACN_Location = (Location) deploymentSpecification_FloatingNameLabel_ACN.getLayoutConstraint();

+		Location deploymentSpecification_FloatingNameLabel_ACN_Location = (Location) deploymentSpecification_FloatingNameLabel_ACN

+				.getLayoutConstraint();

 		deploymentSpecification_FloatingNameLabel_ACN_Location.setX(25);

 		deploymentSpecification_FloatingNameLabel_ACN_Location.setY(0);

 		return node;

@@ -991,11 +1076,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createLink_DescriptorEdge(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createLink_DescriptorEdge(View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		List<RelativeBendpoint> points = new ArrayList<>(2);

+		List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1006,10 +1092,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		// 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;

 	}

@@ -1017,11 +1103,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createComment_AnnotatedElementEdge(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createComment_AnnotatedElementEdge(View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		List<RelativeBendpoint> points = new ArrayList<>(2);

+		List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1033,10 +1120,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		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;

 	}

@@ -1044,11 +1131,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createConstraint_ConstrainedElementEdge(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createConstraint_ConstrainedElementEdge(View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		List<RelativeBendpoint> points = new ArrayList<>(2);

+		List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1060,10 +1148,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		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;

 	}

@@ -1071,11 +1159,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createDeployment_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createDeployment_Edge(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		List<RelativeBendpoint> points = new ArrayList<>(2);

+		List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1087,16 +1176,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		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 deployment_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(DeploymentNameEditPart.VISUAL_ID));

 		deployment_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location deployment_NameLabel_Location = (Location) deployment_NameLabel.getLayoutConstraint();

 		deployment_NameLabel_Location.setX(0);

 		deployment_NameLabel_Location.setY(60);

-		Node deployment_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(DeploymentAppliedStereotypeEditPart.VISUAL_ID));

+		Node deployment_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(DeploymentAppliedStereotypeEditPart.VISUAL_ID));

 		deployment_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location deployment_StereotypeLabel_Location = (Location) deployment_StereotypeLabel.getLayoutConstraint();

 		deployment_StereotypeLabel_Location.setX(0);

@@ -1109,11 +1199,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createManifestation_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createManifestation_Edge(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		List<RelativeBendpoint> points = new ArrayList<>(2);

+		List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1125,18 +1216,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		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);

-		// }

-		Node manifestation_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(ManifestationNameEditPart.VISUAL_ID));

+		//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 manifestation_NameLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(ManifestationNameEditPart.VISUAL_ID));

 		manifestation_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location manifestation_NameLabel_Location = (Location) manifestation_NameLabel.getLayoutConstraint();

 		manifestation_NameLabel_Location.setX(0);

 		manifestation_NameLabel_Location.setY(60);

-		Node manifestation_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(ManifestationAppliedStereotypeEditPart.VISUAL_ID));

+		Node manifestation_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(ManifestationAppliedStereotypeEditPart.VISUAL_ID));

 		manifestation_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location manifestation_StereotypeLabel_Location = (Location) manifestation_StereotypeLabel.getLayoutConstraint();

+		Location manifestation_StereotypeLabel_Location = (Location) manifestation_StereotypeLabel

+				.getLayoutConstraint();

 		manifestation_StereotypeLabel_Location.setX(0);

 		manifestation_StereotypeLabel_Location.setY(30);

 

@@ -1147,11 +1241,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createGeneralization_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createGeneralization_Edge(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		List<RelativeBendpoint> points = new ArrayList<>(2);

+		List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1163,13 +1258,15 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		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);

-		// }

-		Node generalization_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

+		//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 generalization_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

 		generalization_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location generalization_StereotypeLabel_Location = (Location) generalization_StereotypeLabel.getLayoutConstraint();

+		Location generalization_StereotypeLabel_Location = (Location) generalization_StereotypeLabel

+				.getLayoutConstraint();

 		generalization_StereotypeLabel_Location.setX(0);

 		generalization_StereotypeLabel_Location.setY(60);

 

@@ -1180,11 +1277,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createDependency_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createDependency_Edge(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		List<RelativeBendpoint> points = new ArrayList<>(2);

+		List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1196,16 +1294,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DependencyLink");

-		// 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 dependency_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(DependencyNameEditPart.VISUAL_ID));

 		dependency_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location dependency_NameLabel_Location = (Location) dependency_NameLabel.getLayoutConstraint();

 		dependency_NameLabel_Location.setX(0);

 		dependency_NameLabel_Location.setY(40);

-		Node dependency_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(DependencyAppliedStereotypeEditPart.VISUAL_ID));

+		Node dependency_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(DependencyAppliedStereotypeEditPart.VISUAL_ID));

 		dependency_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location dependency_StereotypeLabel_Location = (Location) dependency_StereotypeLabel.getLayoutConstraint();

 		dependency_StereotypeLabel_Location.setX(0);

@@ -1218,11 +1317,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createDependency_BranchEdge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createDependency_BranchEdge(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		List<RelativeBendpoint> points = new ArrayList<>(2);

+		List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1234,10 +1334,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DependencyBranchLink");

-		// 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;

 	}

@@ -1245,11 +1345,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createCommunicationPath_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createCommunicationPath_Edge(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		List<RelativeBendpoint> points = new ArrayList<>(2);

+		List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

 		points.add(new RelativeBendpoint());

 		points.add(new RelativeBendpoint());

 		bendpoints.setPoints(points);

@@ -1261,18 +1362,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "CommunicationPath");

-		// 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 communicationPath_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(CommunicationPathNameEditPart.VISUAL_ID));

+		//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 communicationPath_NameLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(CommunicationPathNameEditPart.VISUAL_ID));

 		communicationPath_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location communicationPath_NameLabel_Location = (Location) communicationPath_NameLabel.getLayoutConstraint();

 		communicationPath_NameLabel_Location.setX(0);

 		communicationPath_NameLabel_Location.setY(40);

-		Node communicationPath_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(CommunicationPathAppliedStereotypeEditPart.VISUAL_ID));

+		Node communicationPath_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(CommunicationPathAppliedStereotypeEditPart.VISUAL_ID));

 		communicationPath_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location communicationPath_StereotypeLabel_Location = (Location) communicationPath_StereotypeLabel.getLayoutConstraint();

+		Location communicationPath_StereotypeLabel_Location = (Location) communicationPath_StereotypeLabel

+				.getLayoutConstraint();

 		communicationPath_StereotypeLabel_Location.setX(0);

 		communicationPath_StereotypeLabel_Location.setY(60);

 

@@ -1304,10 +1408,11 @@ 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);

+	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);

 		Node rv = NotationFactory.eINSTANCE.createBasicCompartment();

 

 		rv.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

@@ -1334,7 +1439,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		if (semanticAdapter == null) {

 			return null;

 		}

-		EObject eObject = semanticAdapter.getAdapter(EObject.class);

+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);

 		if (eObject != null) {

 			return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject);

 		}

@@ -1348,15 +1453,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		if (semanticAdapter == null) {

 			return null;

 		}

-		return semanticAdapter.getAdapter(IElementType.class);

+		return (IElementType) semanticAdapter.getAdapter(IElementType.class);

 	}

 

 	/**

 	 * @generated

 	 */

 	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);

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

@@ -1375,36 +1482,37 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE);

+		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName,

+				PreferencesConstantsHelper.COLOR_LINE);

 		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

-		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

+		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

 	}

 

 	/**

 	 * @generated

 	 */

 	private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

-		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

-

+		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));

-

+		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));

 			fillStyle.setGradient(gradientPreferenceConverter.getGradientData());

-			fillStyle

-					.setTransparency(gradientPreferenceConverter.getTransparency());

+			fillStyle.setTransparency(gradientPreferenceConverter.getTransparency());

 		}

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/sheet/UMLPropertySection.java
index fcc55381e8f..93bc9c3884e 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/sheet/UMLPropertySection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/sheet/UMLPropertySection.java
@@ -1,17 +1,17 @@
 /**

  * 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

+  * 

+  * 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.deployment.sheet;

 

-import org.eclipse.gmf.tooling.runtime.sheet.DefaultPropertySection;

+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.sheet.DefaultPropertySection;

 import org.eclipse.ui.views.properties.IPropertySourceProvider;

 

 /**

@@ -21,12 +21,12 @@ public class UMLPropertySection extends DefaultPropertySection implements IPrope
 

 	/**

 	 * Modify/unwrap selection.

-	 *

 	 * @generated

 	 */

 	@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.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/sheet/UMLSheetLabelProvider.java
index 876716d1f96..f8bf870e49a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/sheet/UMLSheetLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/sheet/UMLSheetLabelProvider.java
@@ -63,7 +63,7 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr
 			return (View) element;

 		}

 		if (element instanceof IAdaptable) {

-			return ((IAdaptable) element).getAdapter(View.class);

+			return (View) ((IAdaptable) element).getAdapter(View.class);

 		}

 		return null;

 	}