516 files changed, 79207 insertions, 78889 deletions

diff --git a/.gitignore b/.gitignore
index 8be6129aa98..473b417402a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 bin/
 target/
+sonarlint/
 *.java._trace
 *.pyc
 .DS_Store
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/locator/PortPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/locator/PortPositionLocator.java
index 057c6064257..d468974fbe8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/locator/PortPositionLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/locator/PortPositionLocator.java
@@ -72,6 +72,32 @@ public class PortPositionLocator implements IBorderItemLocator {
 
 	/** the figure */
 	private IFigure figure;
+
+	/**
+	 * Constructor 
+	 *
+	 * @param parentFigure
+	 *            the parent figure
+	 * @param preferredSide
+	 *            unused
+	 * @deprecated           
+	 */
+	@Deprecated // use PortPositionLocator(final IFigure parentFigure)
+	public PortPositionLocator(final IFigure parentFigure, final int preferredSide) {
+		// The preferredSide parameter is not used, just kept here to ensure compatibility
+		// with GMF generated code.
+		this.parentFigure = parentFigure;
+	}
+
+	/**
+	 * Constructor 
+	 * @param parentFigure
+	 *            the parent figure
+	 */
+	public PortPositionLocator(final IFigure parentFigure) {
+		this.parentFigure = parentFigure;
+	}		
+	
 	
 	public int getBorderItemOffset() {
 		return borderItemOffset;
@@ -130,29 +156,7 @@ public class PortPositionLocator implements IBorderItemLocator {
 		return constraint;
 	}	
 
-	/**
-	 * Constructor 
-	 *
-	 * @param parentFigure
-	 *            the parent figure
-	 * @param preferredSide
-	 *            unused
-	 */
-	@Deprecated // use PortPositionLocator(final IFigure parentFigure)
-	public PortPositionLocator(final IFigure parentFigure, final int preferredSide) {
-		// The preferredSide parameter is not used, just kept here to ensure compatibility
-		// with GMF generated code.
-		this.parentFigure = parentFigure;
-	}
 
-	/**
-	 * Constructor 
-	 * @param parentFigure
-	 *            the parent figure
-	 */
-	public PortPositionLocator(final IFigure parentFigure) {
-		this.parentFigure = parentFigure;
-	}	
 	
 	/**
 	 * {@inheritDoc}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsAction.java
index 35a8f70c15f..48700ee74eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsAction.java
@@ -29,54 +29,4 @@ public class ShowHideRelatedContentsAction extends ShowHideContentsAction {
 		super(Messages.ShowHideRelatedContentsAction_Title, Messages.ShowHideRelatedContentsAction_Message, ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY);

 	}

 

-	// /**

-	// * {@inheritDoc}

-	// */

-	// @Override

-	// protected void initAction() {

-	// super.initAction();

-	// setEditorLabelProvider(new EditorLabelProvider());

-	// this.representations = new ArrayList<AbstractShowHideAction.EditPartRepresentation>();

-	//

-	// for(EditPart current : this.selectedElements) {

-	// //the selected elements which aren't Classifier are ignored

-	// EObject element = ((View)current.getModel()).getElement();

-	// if(element instanceof Property) {

-	// Type type = ((Property)element).getType();

-	// if(type instanceof Classifier) {

-	// this.representations.add(new CustomEditPartRepresentation(current, (Classifier)type));

-	// }

-	// }

-	// }

-	// this.setEditorLabelProvider(new CustomEditorLabelProvider());

-	// this.setContentProvider(new CustomContentProvider());

-	//

-	// }

-	//

-	// /**

-	// * The Class CustomContentProvider.

-	// */

-	// protected class CustomContentProvider extends ShowHideContentsAction.ContentProvider {

-	//

-	// /**

-	// * {@inheritDoc}

-	// */

-	// @Override

-	// public Object getParent(Object element) {

-	// if(!(element instanceof EditPartRepresentation)) {

-	// EditPartRepresentation rep = findEditPartRepresentation(element);

-	// if(rep != null) {

-	// //element can be owned by the class (rep), or by a superclass (ClassifierRepresentation)

-	// List<ClassifierRepresentation> classes = ((CustomEditPartRepresentation)rep).getSuperClasses();

-	// for(ClassifierRepresentation classifierRepresentation : classes) {

-	// if(classifierRepresentation.getRepresentedClassifier().getOwnedMembers().contains(element)) {

-	// return classifierRepresentation;

-	// }

-	// }

-	// }

-	// return rep;

-	// }

-	// return null;

-	// }

-	// }

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsHandler.java
index 335dadc36e7..dcf9a25fe9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsHandler.java
@@ -17,7 +17,6 @@ import org.eclipse.papyrus.uml.diagram.common.actions.handlers.AbstractShowHideH
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;

 

 

-// TODO: Auto-generated Javadoc

 /**

  * Handler for the {@link ShowHideRelatedContentsAction}.

  */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortEditPart.java
index be7ea68f4a9..0f2de588ae7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortEditPart.java
@@ -1,10 +1,20 @@
+/*****************************************************************************

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

+ * 

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *   

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

 package org.eclipse.papyrus.uml.diagram.component.custom.edit.part;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -20,11 +30,12 @@ public class CustomPortEditPart extends PortEditPart {
 		super(view);

 	}

 

+	@Override

 	protected NodeFigure createNodePlate() {

-		DefaultSizeNodeFigure result = new RoundedRectangleNodePlateFigure(20, 20);

-		return result;

+		return new RoundedRectangleNodePlateFigure(20, 20);

 	}

 

+	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

 		if(borderItemEditPart instanceof FloatingLabelEditPart) {

 			//Create specific locator

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/ResizablePortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/ResizablePortEditPart.java
index c7510fa54c8..bee80577529 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/ResizablePortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/ResizablePortEditPart.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.uml.diagram.component.custom.edit.part;
 
 import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
@@ -92,7 +91,7 @@ public class ResizablePortEditPart extends PortEditPart {
 	@Override
 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
 		if (borderItemEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure());
 			borderItemContainer.add(((PortEditPart) borderItemEditPart).getFigure(), locator);
 		} else {
 			super.addBorderItem(borderItemContainer, borderItemEditPart);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLayoutEditPolicy.java
index 3c02834407c..9d05df8bd17 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLayoutEditPolicy.java
@@ -26,7 +26,6 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 

-// TODO: Auto-generated Javadoc

 /**

  * This edit policy replaces the GMF generated edit policy for Port.

  * In particular it installs {@link ExternalLabelPrimaryDragRoleEditPolicy} on

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
index 7be9b552354..630dc750f26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
@@ -84,10 +84,6 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
         <behaviour
             xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
             key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy"/>
         <modelFacet>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/helpers/UMLBaseEditHelper.java
index 3d1ffd762aa..6ad5bd3074c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/helpers/UMLBaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/helpers/UMLBaseEditHelper.java
@@ -1,20 +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
- */
-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;
-
-import org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase;
-
-/**
- * @generated
- */
-public class UMLBaseEditHelper extends GeneratedEditHelperBase {
-}
+/**

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

+

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

+

+/**

+ * @generated

+ */

+public class UMLBaseEditHelper extends GeneratedEditHelperBase {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionAppliedStereotypeEditPart.java
index bb68972cfd5..26b468c4ee9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionAppliedStereotypeEditPart.java
@@ -1,841 +1,841 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Abstraction_StereotypeLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID),
-				new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public AbstractionAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																AbstractionAppliedStereotypeEditPart.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Abstraction_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Stereotype";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

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

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

+import org.eclipse.jface.dialogs.Dialog;

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

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Abstraction_StereotypeLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public AbstractionAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																AbstractionAppliedStereotypeEditPart.this),

+														(String) value));

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

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

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

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

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionEditPart.java
index 12303525c56..f9a60c8be1b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionEditPart.java
@@ -1,127 +1,127 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-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.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-
-/**
- * @generated
- */
-public class AbstractionEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Abstraction_Edge";
-
-	/**
-	 * @generated
-	 */
-	public AbstractionEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeLinkLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof AbstractionNameEditPart) {
-			((AbstractionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-		}
-		if (childEditPart instanceof AbstractionAppliedStereotypeEditPart) {
-			((AbstractionAppliedStereotypeEditPart) childEditPart)
-					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof AbstractionNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof AbstractionAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * 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();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public DashedEdgeFigure getPrimaryShape() {
-		return (DashedEdgeFigure) getFigure();
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+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.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+

+/**

+ * @generated

+ */

+public class AbstractionEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Abstraction_Edge";

+

+	/**

+	 * @generated

+	 */

+	public AbstractionEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AbstractionNameEditPart) {

+			((AbstractionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if (childEditPart instanceof AbstractionAppliedStereotypeEditPart) {

+			((AbstractionAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AbstractionNameEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof AbstractionAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public DashedEdgeFigure getPrimaryShape() {

+		return (DashedEdgeFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionNameEditPart.java
index 026c9444da7..d74cd572e62 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionNameEditPart.java
@@ -1,838 +1,838 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class AbstractionNameEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Abstraction_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionNameEditPart.VISUAL_ID),
-				new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public AbstractionNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), AbstractionNameEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Abstraction_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

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

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

+import org.eclipse.jface.dialogs.Dialog;

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

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class AbstractionNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Abstraction_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionNameEditPart.VISUAL_ID),

+				new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public AbstractionNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

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

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

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

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentAnnotatedElementEditPart.java
index 2a30a355ed3..e69beef382d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentAnnotatedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentAnnotatedElementEditPart.java
@@ -1,71 +1,71 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-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.figure.edge.SimpleDashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-
-/**
- * @generated
- */
-public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Comment_AnnotatedElementEdge";
-
-	/**
-	 * @generated
-	 */
-	public CommentAnnotatedElementEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-	}
-
-	/**
-	 * 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();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public SimpleDashedEdgeFigure getPrimaryShape() {
-		return (SimpleDashedEdgeFigure) getFigure();
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+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.figure.edge.SimpleDashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+

+/**

+ * @generated

+ */

+public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Comment_AnnotatedElementEdge";

+

+	/**

+	 * @generated

+	 */

+	public CommentAnnotatedElementEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+	}

+

+	/**

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public SimpleDashedEdgeFigure getPrimaryShape() {

+		return (SimpleDashedEdgeFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPart.java
index 043a11152a9..dd69a18dbab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPart.java
@@ -1,866 +1,866 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class CommentBodyEditPart extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Comment_BodyLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public CommentBodyEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), CommentBodyEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Comment_Shape, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class CommentBodyEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Comment_BodyLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public CommentBodyEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

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

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPartPCN.java
index 5bd7d031e6b..b71bf65b9cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPartPCN.java
@@ -1,866 +1,866 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class CommentBodyEditPartPCN extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Comment_BodyLabel_CN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public CommentBodyEditPartPCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), CommentBodyEditPartPCN.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Comment_Shape_CN, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class CommentBodyEditPartPCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Comment_BodyLabel_CN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public CommentBodyEditPartPCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

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

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java
index 3d33bb66ae5..4745f2a672a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java
@@ -1,286 +1,286 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class CommentEditPart extends AbstractCommentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Comment_Shape";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public CommentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		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());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @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;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CommentBodyEditPart) {
-			((CommentBodyEditPart) childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CommentBodyEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

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

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class CommentEditPart extends AbstractCommentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Comment_Shape";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CommentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

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

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CommentBodyEditPart) {

+			((CommentBodyEditPart) childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CommentBodyEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

+		return result;

+	}

+

+	/**

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

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

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

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java
index db4e524b75e..40421202927 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java
@@ -1,286 +1,286 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class CommentEditPartPCN extends AbstractCommentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Comment_Shape_CN";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public CommentEditPartPCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusReflowableShapeEditPolicy());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @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;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CommentBodyEditPartPCN) {
-			((CommentBodyEditPartPCN) childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CommentBodyEditPartPCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPartPCN.VISUAL_ID));
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class CommentEditPartPCN extends AbstractCommentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Comment_Shape_CN";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CommentEditPartPCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusReflowableShapeEditPolicy());

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CommentBodyEditPartPCN) {

+			((CommentBodyEditPartPCN) childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CommentBodyEditPartPCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

+		return result;

+	}

+

+	/**

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

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

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

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPartPCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPart.java
index 7409f97439a..21b4134cd26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPart.java
@@ -1,136 +1,136 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.Messages;
-
-/**
- * @generated
- */
-public class ComponentCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Component_StructureCompartment";
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ComponentCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		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.component.edit.policies.ComponentCompositeCompartmentCanonicalEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		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));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.component.part.Messages;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Component_StructureCompartment";

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getCompartmentName() {

+		return Messages.ComponentCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+		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.component.edit.policies.ComponentCompositeCompartmentCanonicalEditPolicy());

+

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

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

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setRatio(Double ratio) {

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

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

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

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartCN.java
index 54c32f5f23c..6612c98f1e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartCN.java
@@ -1,136 +1,136 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.Messages;
-
-/**
- * @generated
- */
-public class ComponentCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Component_StructureCompartment_CCN";
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ComponentCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		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.component.edit.policies.ComponentCompositeCompartmentCanonicalEditPolicyCN());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		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));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.component.part.Messages;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Component_StructureCompartment_CCN";

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getCompartmentName() {

+		return Messages.ComponentCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+		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.component.edit.policies.ComponentCompositeCompartmentCanonicalEditPolicyCN());

+

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

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

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setRatio(Double ratio) {

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

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

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

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartPCN.java
index 009172bf672..43cca2cf5c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartPCN.java
@@ -1,136 +1,136 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.Messages;
-
-/**
- * @generated
- */
-public class ComponentCompositeCompartmentEditPartPCN extends LinkLFShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Component_StructureCompartment_CN";
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeCompartmentEditPartPCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ComponentCompositeCompartmentEditPartPCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		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.component.edit.policies.ComponentCompositeCompartmentCanonicalEditPolicyPCN());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		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));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.component.part.Messages;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeCompartmentEditPartPCN extends LinkLFShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Component_StructureCompartment_CN";

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeCompartmentEditPartPCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getCompartmentName() {

+		return Messages.ComponentCompositeCompartmentEditPartPCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+		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.component.edit.policies.ComponentCompositeCompartmentCanonicalEditPolicyPCN());

+

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

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

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setRatio(Double ratio) {

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

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

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

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentDiagramEditPart.java
index 4a4db0c24bc..57642c07233 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentDiagramEditPart.java
@@ -1,63 +1,63 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy;
-
-/**
- * @generated
- */
-public class ComponentDiagramEditPart extends PapyrusDiagramEditPart {
-
-	/**
-	 * @generated
-	 */
-	public final static String MODEL_ID = "PapyrusUMLComponentDiagram"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Package_ComponentDiagram";
-
-	/**
-	 * @generated
-	 */
-	public ComponentDiagramEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		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.component.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);
-	}
-}
+/**

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

+

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;

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

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

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

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

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy;

+

+/**

+ * @generated

+ */

+public class ComponentDiagramEditPart extends PapyrusDiagramEditPart {

+

+	/**

+	 * @generated

+	 */

+	public final static String MODEL_ID = "PapyrusUMLComponentDiagram"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Package_ComponentDiagram";

+

+	/**

+	 * @generated

+	 */

+	public ComponentDiagramEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		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.component.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.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java
index 908c93aa512..081d933d002 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java
@@ -1,396 +1,396 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.BasicCompartment;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ComponentEditPart extends RoundedCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Component_PackagedElementShape";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ComponentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		// in Papyrus diagrams are not strongly synchronised
-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentCanonicalEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,
-				new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,
-				new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,
-				new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				String vid = UMLVisualIDRegistry.getVisualID(childView);
-				if (vid != null) {
-					switch (vid) {
-					case ComponentFloatingLabelEditPart.VISUAL_ID:
-						return new BorderItemSelectionEditPolicy() {
-
-							@Override
-							protected List<?> createSelectionHandles() {
-								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-								mh.setBorder(null);
-								return Collections.singletonList(mh);
-							}
-						};
-					case PortEditPart.VISUAL_ID:
-						return new BorderItemResizableEditPolicy();
-					}
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	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
-		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!
-		 */
-		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 (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new CompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure
-	 *
-	 * @generated
-	 */
-	@Override
-	public CompositeFigure getPrimaryShape() {
-		return (CompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentNameEditPart) {
-			((ComponentNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		if (childEditPart instanceof ComponentCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
-			pane.add(((ComponentCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-
-		// Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ComponentCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ComponentCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ComponentCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof ComponentFloatingLabelEditPart) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else {
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNameEditPart.VISUAL_ID));
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

+import org.eclipse.gmf.runtime.notation.Edge;

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

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

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

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ComponentEditPart extends RoundedCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Component_PackagedElementShape";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ComponentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		super.createDefaultEditPolicies();

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

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

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

+		//in Papyrus diagrams are not strongly synchronised

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

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

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

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

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

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

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

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

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				String vid = UMLVisualIDRegistry.getVisualID(childView);

+				if (vid != null) {

+					switch (vid) {

+					case ComponentFloatingLabelEditPart.VISUAL_ID:

+						return new BorderItemSelectionEditPolicy() {

+

+							@Override

+							protected List<?> createSelectionHandles() {

+								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+								mh.setBorder(null);

+								return Collections.singletonList(mh);

+							}

+						};

+					case PortEditPart.VISUAL_ID:

+						return new BorderItemResizableEditPolicy();

+					}

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	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

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		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 (modelChildren.contains(event.getNotifier())) {

+					return;

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createNodeShape() {

+		return primaryShape = new CompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure

+	 *

+	 * @generated

+	 */

+	@Override

+	public CompositeFigure getPrimaryShape() {

+		return (CompositeFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ComponentNameEditPart) {

+			((ComponentNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+		if (childEditPart instanceof ComponentCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

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

+			pane.add(((ComponentCompositeCompartmentEditPart) childEditPart).getFigure());

+			return true;

+		}

+

+		//Papyrus Gencode :Affixed Port locator

+		if (childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ComponentNameEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ComponentCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ComponentCompositeCompartmentEditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ComponentCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof ComponentFloatingLabelEditPart) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);

+		return result;

+	}

+

+	/**

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

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

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

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java
index 0f72c2487b9..b7b8b1db1d7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java
@@ -1,396 +1,396 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.BasicCompartment;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ComponentEditPartCN extends RoundedCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Component_PackagedElementShape_CCN";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ComponentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		// in Papyrus diagrams are not strongly synchronised
-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentCanonicalEditPolicyCN());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,
-				new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,
-				new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,
-				new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				String vid = UMLVisualIDRegistry.getVisualID(childView);
-				if (vid != null) {
-					switch (vid) {
-					case ComponentFloatingLabelEditPartCN.VISUAL_ID:
-						return new BorderItemSelectionEditPolicy() {
-
-							@Override
-							protected List<?> createSelectionHandles() {
-								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-								mh.setBorder(null);
-								return Collections.singletonList(mh);
-							}
-						};
-					case PortEditPart.VISUAL_ID:
-						return new BorderItemResizableEditPolicy();
-					}
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	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
-		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!
-		 */
-		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 (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new CompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure
-	 *
-	 * @generated
-	 */
-	@Override
-	public CompositeFigure getPrimaryShape() {
-		return (CompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentNameEditPartCN) {
-			((ComponentNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		if (childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
-			pane.add(((ComponentCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-
-		// Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ComponentCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ComponentCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof ComponentFloatingLabelEditPartCN) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else {
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

+import org.eclipse.gmf.runtime.notation.Edge;

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

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

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

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ComponentEditPartCN extends RoundedCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Component_PackagedElementShape_CCN";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ComponentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		super.createDefaultEditPolicies();

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

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

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

+		//in Papyrus diagrams are not strongly synchronised

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

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

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

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

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

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

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

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

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				String vid = UMLVisualIDRegistry.getVisualID(childView);

+				if (vid != null) {

+					switch (vid) {

+					case ComponentFloatingLabelEditPartCN.VISUAL_ID:

+						return new BorderItemSelectionEditPolicy() {

+

+							@Override

+							protected List<?> createSelectionHandles() {

+								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+								mh.setBorder(null);

+								return Collections.singletonList(mh);

+							}

+						};

+					case PortEditPart.VISUAL_ID:

+						return new BorderItemResizableEditPolicy();

+					}

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	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

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		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 (modelChildren.contains(event.getNotifier())) {

+					return;

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createNodeShape() {

+		return primaryShape = new CompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure

+	 *

+	 * @generated

+	 */

+	@Override

+	public CompositeFigure getPrimaryShape() {

+		return (CompositeFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ComponentNameEditPartCN) {

+			((ComponentNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+		if (childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

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

+			pane.add(((ComponentCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			return true;

+		}

+

+		//Papyrus Gencode :Affixed Port locator

+		if (childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ComponentNameEditPartCN) {

+			return true;

+		}

+		if (childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ComponentCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ComponentCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof ComponentFloatingLabelEditPartCN) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);

+		return result;

+	}

+

+	/**

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

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

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

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java
index a2333cf6652..3160a3cd909 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java
@@ -1,396 +1,396 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.BasicCompartment;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ComponentEditPartPCN extends RoundedCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Component_PackagedElementShape_CN";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ComponentEditPartPCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		// in Papyrus diagrams are not strongly synchronised
-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentCanonicalEditPolicyPCN());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,
-				new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,
-				new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,
-				new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				String vid = UMLVisualIDRegistry.getVisualID(childView);
-				if (vid != null) {
-					switch (vid) {
-					case ComponentFloatingLabelEditPartPCN.VISUAL_ID:
-						return new BorderItemSelectionEditPolicy() {
-
-							@Override
-							protected List<?> createSelectionHandles() {
-								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-								mh.setBorder(null);
-								return Collections.singletonList(mh);
-							}
-						};
-					case PortEditPart.VISUAL_ID:
-						return new BorderItemResizableEditPolicy();
-					}
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	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
-		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!
-		 */
-		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 (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new CompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure
-	 *
-	 * @generated
-	 */
-	@Override
-	public CompositeFigure getPrimaryShape() {
-		return (CompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentNameEditPartPCN) {
-			((ComponentNameEditPartPCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		if (childEditPart instanceof ComponentCompositeCompartmentEditPartPCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
-			pane.add(((ComponentCompositeCompartmentEditPartPCN) childEditPart).getFigure());
-			return true;
-		}
-
-		// Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentNameEditPartPCN) {
-			return true;
-		}
-		if (childEditPart instanceof ComponentCompositeCompartmentEditPartPCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ComponentCompositeCompartmentEditPartPCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ComponentCompositeCompartmentEditPartPCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof ComponentFloatingLabelEditPartPCN) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else {
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNameEditPartPCN.VISUAL_ID));
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

+import org.eclipse.gmf.runtime.notation.Edge;

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

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

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

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ComponentEditPartPCN extends RoundedCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Component_PackagedElementShape_CN";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ComponentEditPartPCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		super.createDefaultEditPolicies();

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

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

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

+		//in Papyrus diagrams are not strongly synchronised

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

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

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

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

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

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

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

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

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				String vid = UMLVisualIDRegistry.getVisualID(childView);

+				if (vid != null) {

+					switch (vid) {

+					case ComponentFloatingLabelEditPartPCN.VISUAL_ID:

+						return new BorderItemSelectionEditPolicy() {

+

+							@Override

+							protected List<?> createSelectionHandles() {

+								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+								mh.setBorder(null);

+								return Collections.singletonList(mh);

+							}

+						};

+					case PortEditPart.VISUAL_ID:

+						return new BorderItemResizableEditPolicy();

+					}

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	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

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		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 (modelChildren.contains(event.getNotifier())) {

+					return;

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createNodeShape() {

+		return primaryShape = new CompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure

+	 *

+	 * @generated

+	 */

+	@Override

+	public CompositeFigure getPrimaryShape() {

+		return (CompositeFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ComponentNameEditPartPCN) {

+			((ComponentNameEditPartPCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+		if (childEditPart instanceof ComponentCompositeCompartmentEditPartPCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

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

+			pane.add(((ComponentCompositeCompartmentEditPartPCN) childEditPart).getFigure());

+			return true;

+		}

+

+		//Papyrus Gencode :Affixed Port locator

+		if (childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ComponentNameEditPartPCN) {

+			return true;

+		}

+		if (childEditPart instanceof ComponentCompositeCompartmentEditPartPCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ComponentCompositeCompartmentEditPartPCN) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ComponentCompositeCompartmentEditPartPCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof ComponentFloatingLabelEditPartPCN) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);

+		return result;

+	}

+

+	/**

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

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

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

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNameEditPartPCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPart.java
index ed33ad55b88..0940aace92e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPart.java
@@ -1,848 +1,848 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ComponentFloatingLabelEditPart extends FloatingLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Component_FloatingNameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPart.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ComponentFloatingLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),
-														ComponentFloatingLabelEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Component_PackagedElementShape, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new PapyrusWrappingLabel();
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

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

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

+import org.eclipse.jface.dialogs.Dialog;

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

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ComponentFloatingLabelEditPart extends FloatingLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Component_FloatingNameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComponentFloatingLabelEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

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

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

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

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

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(

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

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Component_PackagedElementShape, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new PapyrusWrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartCN.java
index 50736d9d6c9..8598dc55800 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartCN.java
@@ -1,850 +1,850 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ComponentFloatingLabelEditPartCN extends FloatingLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Component_FloatingNameLabel_CCN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPartCN.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ComponentFloatingLabelEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																ComponentFloatingLabelEditPartCN.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Component_PackagedElementShape_CCN, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new PapyrusWrappingLabel();
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

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

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

+import org.eclipse.jface.dialogs.Dialog;

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

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ComponentFloatingLabelEditPartCN extends FloatingLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Component_FloatingNameLabel_CCN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComponentFloatingLabelEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

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

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

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

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

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ComponentFloatingLabelEditPartCN.this),

+														(String) value));

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Component_PackagedElementShape_CCN, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new PapyrusWrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartPCN.java
index 1a6613e960a..4403f057815 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartPCN.java
@@ -1,850 +1,850 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ComponentFloatingLabelEditPartPCN extends FloatingLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Component_FloatingNameLabel_CN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPartPCN.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ComponentFloatingLabelEditPartPCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																ComponentFloatingLabelEditPartPCN.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Component_PackagedElementShape_CN, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new PapyrusWrappingLabel();
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

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

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

+import org.eclipse.jface.dialogs.Dialog;

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

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ComponentFloatingLabelEditPartPCN extends FloatingLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Component_FloatingNameLabel_CN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPartPCN.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComponentFloatingLabelEditPartPCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

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

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

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

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

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ComponentFloatingLabelEditPartPCN.this),

+														(String) value));

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Component_PackagedElementShape_CN, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new PapyrusWrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPart.java
index 1a2015114df..b84efb2b68b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPart.java
@@ -1,885 +1,885 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ComponentNameEditPart extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Component_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ComponentNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), ComponentNameEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Component_PackagedElementShape, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON
-				.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ComponentNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Component_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ComponentNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Component_PackagedElementShape, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartCN.java
index 384d95147bc..4a65bc240af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartCN.java
@@ -1,885 +1,885 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Component_NameLabel_CCN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ComponentNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), ComponentNameEditPartCN.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Component_PackagedElementShape_CCN, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON
-				.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Component_NameLabel_CCN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ComponentNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Component_PackagedElementShape_CCN, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartPCN.java
index 8035102722f..6135e3202f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartPCN.java
@@ -1,867 +1,867 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ComponentNameEditPartPCN extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Component_NameLabel_CN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ComponentNameEditPartPCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), ComponentNameEditPartPCN.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Component_PackagedElementShape_CN, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ComponentNameEditPartPCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Component_NameLabel_CN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ComponentNameEditPartPCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Component_PackagedElementShape_CN, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
index 037ccee0128..520279e37fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
@@ -1,833 +1,833 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "ComponentRealization_StereotypeLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID),
-				new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ComponentRealizationAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(
-												ParserUtil.getParserAdapter(getParserElement(),
-														ComponentRealizationAppliedStereotypeEditPart.this),
-												(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.ComponentRealization_Edge, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Stereotype";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

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

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

+import org.eclipse.jface.dialogs.Dialog;

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

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "ComponentRealization_StereotypeLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComponentRealizationAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														ComponentRealizationAppliedStereotypeEditPart.this),

+												(String) value));

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.ComponentRealization_Edge, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

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

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationEditPart.java
index a30b4b93d96..873e514231d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationEditPart.java
@@ -1,127 +1,127 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-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.InterfaceRealizationFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-
-/**
- * @generated
- */
-public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "ComponentRealization_Edge";
-
-	/**
-	 * @generated
-	 */
-	public ComponentRealizationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeLinkLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentRealizationNameEditPart) {
-			((ComponentRealizationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-		}
-		if (childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {
-			((ComponentRealizationAppliedStereotypeEditPart) childEditPart)
-					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentRealizationNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * 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 InterfaceRealizationFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public InterfaceRealizationFigure getPrimaryShape() {
-		return (InterfaceRealizationFigure) getFigure();
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

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

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+

+/**

+ * @generated

+ */

+public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "ComponentRealization_Edge";

+

+	/**

+	 * @generated

+	 */

+	public ComponentRealizationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ComponentRealizationNameEditPart) {

+			((ComponentRealizationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if (childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {

+			((ComponentRealizationAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ComponentRealizationNameEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public InterfaceRealizationFigure getPrimaryShape() {

+		return (InterfaceRealizationFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationNameEditPart.java
index 9207f4f8689..fe5bc66f112 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationNameEditPart.java
@@ -1,842 +1,842 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "ComponentRealization_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID),
-				new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ComponentRealizationNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																ComponentRealizationNameEditPart.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.ComponentRealization_Edge, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

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

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

+import org.eclipse.jface.dialogs.Dialog;

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

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "ComponentRealization_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID),

+				new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComponentRealizationNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ComponentRealizationNameEditPart.this),

+														(String) value));

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.ComponentRealization_Edge, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

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

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java
index 03c524786db..0021769c6a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java
@@ -1,824 +1,824 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Connector_StereotypeLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID),
-				new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ConnectorAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																ConnectorAppliedStereotypeEditPart.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Connector_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

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

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

+import org.eclipse.jface.dialogs.Dialog;

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

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Connector_StereotypeLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConnectorAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ConnectorAppliedStereotypeEditPart.this),

+														(String) value));

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

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

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java
index 5c70f562836..d0120429b08 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java
@@ -1,122 +1,122 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-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.component.custom.figure.edges.ConnectorFigure;
-
-/**
- * @generated
- */
-public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Connector_Edge";
-
-	/**
-	 * @generated
-	 */
-	public ConnectorEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeLinkLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConnectorAppliedStereotypeEditPart) {
-			((ConnectorAppliedStereotypeEditPart) childEditPart)
-					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());
-		}
-		if (childEditPart instanceof ConnectorNameEditPart) {
-			((ConnectorNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConnectorAppliedStereotypeEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ConnectorNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * 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 ConnectorFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ConnectorFigure getPrimaryShape() {
-		return (ConnectorFigure) getFigure();
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+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.component.custom.figure.edges.ConnectorFigure;

+

+/**

+ * @generated

+ */

+public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Connector_Edge";

+

+	/**

+	 * @generated

+	 */

+	public ConnectorEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConnectorAppliedStereotypeEditPart) {

+			((ConnectorAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		if (childEditPart instanceof ConnectorNameEditPart) {

+			((ConnectorNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConnectorAppliedStereotypeEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ConnectorNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ConnectorFigure getPrimaryShape() {

+		return (ConnectorFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java
index 565b11c5635..7803cc19c5b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java
@@ -1,838 +1,838 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConnectorNameEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Connector_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry
-						.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorNameEditPart.VISUAL_ID),
-				new Point(0, -20));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ConnectorNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), ConnectorNameEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Connector_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

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

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

+import org.eclipse.jface.dialogs.Dialog;

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

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConnectorNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Connector_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry

+						.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorNameEditPart.VISUAL_ID),

+				new Point(0, -20));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConnectorNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

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

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

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

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintConstrainedElementEditPart.java
index afa6d396ff1..51638f079da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintConstrainedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintConstrainedElementEditPart.java
@@ -1,71 +1,71 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-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.figure.edge.SimpleDashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-
-/**
- * @generated
- */
-public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Constraint_ConstrainedElementEdge";
-
-	/**
-	 * @generated
-	 */
-	public ConstraintConstrainedElementEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-	}
-
-	/**
-	 * 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();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public SimpleDashedEdgeFigure getPrimaryShape() {
-		return (SimpleDashedEdgeFigure) getFigure();
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+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.figure.edge.SimpleDashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+

+/**

+ * @generated

+ */

+public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Constraint_ConstrainedElementEdge";

+

+	/**

+	 * @generated

+	 */

+	public ConstraintConstrainedElementEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+	}

+

+	/**

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public SimpleDashedEdgeFigure getPrimaryShape() {

+		return (SimpleDashedEdgeFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java
index 76edbea1b79..a3dcac13941 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java
@@ -1,291 +1,291 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ConstraintEditPart extends AbstractConstraintEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Constraint_Shape";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		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
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @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;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConstraintNameEditPart) {
-			((ConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ConstraintSpecificationEditPart) {
-			((ConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConstraintNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ConstraintSpecificationEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

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

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ConstraintEditPart extends AbstractConstraintEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Constraint_Shape";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		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

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConstraintNameEditPart) {

+			((ConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		if (childEditPart instanceof ConstraintSpecificationEditPart) {

+			((ConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConstraintNameEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ConstraintSpecificationEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

+		return result;

+	}

+

+	/**

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

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

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

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java
index 45faa0e6aa1..21291308c52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java
@@ -1,291 +1,291 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Constraint_Shape_CN";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintEditPartPCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		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
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @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;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConstraintNameEditPartPCN) {
-			((ConstraintNameEditPartPCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ConstraintSpecificationEditPartPCN) {
-			((ConstraintSpecificationEditPartPCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConstraintNameEditPartPCN) {
-			return true;
-		}
-		if (childEditPart instanceof ConstraintSpecificationEditPartPCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPartPCN.VISUAL_ID));
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ConstraintEditPartPCN extends AbstractConstraintEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Constraint_Shape_CN";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintEditPartPCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

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

+		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

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConstraintNameEditPartPCN) {

+			((ConstraintNameEditPartPCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		if (childEditPart instanceof ConstraintSpecificationEditPartPCN) {

+			((ConstraintSpecificationEditPartPCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConstraintNameEditPartPCN) {

+			return true;

+		}

+		if (childEditPart instanceof ConstraintSpecificationEditPartPCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

+		return result;

+	}

+

+	/**

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

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

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

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPartPCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPart.java
index 6bb19208881..422c08de4d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPart.java
@@ -1,884 +1,884 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConstraintNameEditPart extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Constraint_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), ConstraintNameEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Constraint_Shape, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON
-				.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConstraintNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Constraint_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

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

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPartPCN.java
index 5cd3f55851b..d1bb1bec8e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPartPCN.java
@@ -1,884 +1,884 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConstraintNameEditPartPCN extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Constraint_NameLabel_CN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintNameEditPartPCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), ConstraintNameEditPartPCN.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Constraint_Shape_CN, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON
-				.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConstraintNameEditPartPCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Constraint_NameLabel_CN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintNameEditPartPCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

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

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPart.java
index 107ecb71aa2..9f7feffd18d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPart.java
@@ -1,885 +1,885 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Constraint_BodyLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintSpecificationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),
-														ConstraintSpecificationEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Constraint_Shape, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON
-				.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Constraint_BodyLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintSpecificationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(

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

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

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

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPartPCN.java
index 0a6f793dff9..4af9579d23a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPartPCN.java
@@ -1,887 +1,887 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConstraintSpecificationEditPartPCN extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Constraint_BodyLabel_CN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintSpecificationEditPartPCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																ConstraintSpecificationEditPartPCN.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Constraint_Shape_CN, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON
-				.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConstraintSpecificationEditPartPCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Constraint_BodyLabel_CN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintSpecificationEditPartPCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ConstraintSpecificationEditPartPCN.this),

+														(String) value));

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

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

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java
index cf1c1f0bdd9..6df6f9aa1e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java
@@ -1,277 +1,287 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.ComponentDiagramChangeStereotypedShapeEditpolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "NamedElement_DefaultShape";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DefaultNamedElementEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY,
-				new ComponentDiagramChangeStereotypedShapeEditpolicy());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new RoundedCompartmentFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 *
-	 * @generated
-	 */
-	@Override
-	public RoundedCompartmentFigure getPrimaryShape() {
-		return (RoundedCompartmentFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DefaultNamedElementNameEditPart) {
-			((DefaultNamedElementNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DefaultNamedElementNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 50);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DefaultNamedElementNameEditPart.VISUAL_ID));
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.ComponentDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "NamedElement_DefaultShape";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DefaultNamedElementEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

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

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

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

+		installEditPolicy(ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY,

+				new ComponentDiagramChangeStereotypedShapeEditpolicy());

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	*Papyrus codeGen

+	*@generated

+	**/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createNodeShape() {

+		return primaryShape = new RoundedCompartmentFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 *

+	 * @generated

+	 */

+	@Override

+	public RoundedCompartmentFigure getPrimaryShape() {

+		return (RoundedCompartmentFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof DefaultNamedElementNameEditPart) {

+			((DefaultNamedElementNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof DefaultNamedElementNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 50);

+		return result;

+	}

+

+	/**

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

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

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

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DefaultNamedElementNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java
index 196a05cd36a..44e7f415075 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java
@@ -1,868 +1,868 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "NamedElement_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DefaultNamedElementNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),
-														DefaultNamedElementNameEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.NamedElement_DefaultShape, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "NamedElement_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DefaultNamedElementNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(

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

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.NamedElement_DefaultShape, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyAppliedStereotypeEditPart.java
index e2d52a2eea5..078c4fa92ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyAppliedStereotypeEditPart.java
@@ -1,833 +1,833 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Dependency_StereotypeLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID),
-				new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public DependencyAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																DependencyAppliedStereotypeEditPart.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Dependency_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Stereotype";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

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

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

+import org.eclipse.jface.dialogs.Dialog;

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

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Dependency_StereotypeLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public DependencyAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																DependencyAppliedStereotypeEditPart.this),

+														(String) value));

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

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

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

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

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java
index f606b4777c4..a76e4f11e40 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java
@@ -1,71 +1,71 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-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.figure.edge.DashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-
-/**
- * @generated
- */
-public class DependencyBranchEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Dependency_BranchEdge";
-
-	/**
-	 * @generated
-	 */
-	public DependencyBranchEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-	}
-
-	/**
-	 * 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();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public DashedEdgeFigure getPrimaryShape() {
-		return (DashedEdgeFigure) getFigure();
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+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.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+

+/**

+ * @generated

+ */

+public class DependencyBranchEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Dependency_BranchEdge";

+

+	/**

+	 * @generated

+	 */

+	public DependencyBranchEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+	}

+

+	/**

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public DashedEdgeFigure getPrimaryShape() {

+		return (DashedEdgeFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyEditPart.java
index 503fafc3bf3..23dde08aa54 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyEditPart.java
@@ -1,127 +1,127 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-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.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-
-/**
- * @generated
- */
-public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Dependency_Edge";
-
-	/**
-	 * @generated
-	 */
-	public DependencyEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeLinkLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DependencyNameEditPart) {
-			((DependencyNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-		}
-		if (childEditPart instanceof DependencyAppliedStereotypeEditPart) {
-			((DependencyAppliedStereotypeEditPart) childEditPart)
-					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DependencyNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof DependencyAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * 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();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public DashedEdgeFigure getPrimaryShape() {
-		return (DashedEdgeFigure) getFigure();
-	}
-}
+/**

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

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+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.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+

+/**

+ * @generated

+ */

+public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Dependency_Edge";

+

+	/**

+	 * @generated

+	 */

+	public DependencyEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof DependencyNameEditPart) {

+			((DependencyNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if (childEditPart instanceof DependencyAppliedStereotypeEditPart) {

+			((DependencyAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof DependencyNameEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof DependencyAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public DashedEdgeFigure getPrimaryShape() {

+		return (DashedEdgeFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNameEditPart.java
index 4f5c348340c..87776475298 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNameEditPart.java
@@ -1,838 +1,838 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DependencyNameEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Dependency_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry
-						.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNameEditPart.VISUAL_ID),
-				new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public DependencyNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), DependencyNameEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Dependency_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

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

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

+import org.eclipse.jface.dialogs.Dialog;

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

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DependencyNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Dependency_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry

+						.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNameEditPart.VISUAL_ID),

+				new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public DependencyNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

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

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

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

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

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

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

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

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

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

+						this);

+			} else {

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

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

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

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java
index ddc7f901e02..23349fe810f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java
@@ -1,253 +1,253 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;
-import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DependencyNodeEditPart extends NodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Dependency_Shape";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DependencyNodeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				String vid = UMLVisualIDRegistry.getVisualID(childView);
-				if (vid != null) {
-					switch (vid) {
-					case MultiDependencyLabelEditPart.VISUAL_ID:
-					case DependencyNodeFloatingLabelEditPart.VISUAL_ID:
-						return new BorderItemSelectionEditPolicy() {
-
-							@Override
-							protected List<?> createSelectionHandles() {
-								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-								mh.setBorder(null);
-								return Collections.singletonList(mh);
-							}
-						};
-					}
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new RoundedCompartmentFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.DependencyNodeFigure
-	 *
-	 * @generated
-	 */
-	@Override
-	public RoundedCompartmentFigure getPrimaryShape() {
-		return (RoundedCompartmentFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof MultiDependencyLabelEditPart) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else if (borderItemEditPart instanceof DependencyNodeFloatingLabelEditPart) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else {
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(10, 10);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(MultiDependencyLabelEditPart.VISUAL_ID));
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

+import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DependencyNodeEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Dependency_Shape";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DependencyNodeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

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

+		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

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

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

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				String vid = UMLVisualIDRegistry.getVisualID(childView);

+				if (vid != null) {

+					switch (vid) {

+					case MultiDependencyLabelEditPart.VISUAL_ID:

+					case DependencyNodeFloatingLabelEditPart.VISUAL_ID:

+						return new BorderItemSelectionEditPolicy() {

+

+							@Override

+							protected List<?> createSelectionHandles() {

+								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+								mh.setBorder(null);

+								return Collections.singletonList(mh);

+							}

+						};

+					}

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createNodeShape() {

+		return primaryShape = new RoundedCompartmentFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.DependencyNodeFigure

+	 *

+	 * @generated

+	 */

+	@Override

+	public RoundedCompartmentFigure getPrimaryShape() {

+		return (RoundedCompartmentFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof MultiDependencyLabelEditPart) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if (borderItemEditPart instanceof DependencyNodeFloatingLabelEditPart) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(10, 10);

+		return result;

+	}

+

+	/**

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

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(MultiDependencyLabelEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeFloatingLabelEditPart.java
index 5b81635ff03..8e33b2731dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeFloatingLabelEditPart.java
@@ -1,849 +1,849 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DependencyNodeFloatingLabelEditPart extends FloatingLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Dependency_FloatingNameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeFloatingLabelEditPart.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public DependencyNodeFloatingLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																DependencyNodeFloatingLabelEditPart.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Dependency_Shape, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new PapyrusWrappingLabel();
-	}
-}
+/**

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

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

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

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

+import org.eclipse.jface.dialogs.Dialog;

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

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DependencyNodeFloatingLabelEditPart extends FloatingLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Dependency_FloatingNameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public DependencyNodeFloatingLabelEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

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

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

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

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

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

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

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

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

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

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

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																DependencyNodeFloatingLabelEditPart.this),

+														(String) value));

+									}

+								});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Dependency_Shape, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new PapyrusWrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationAppliedStereotypeEditPart.java
index 9324804396e..e46b270ba20 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationAppliedStereotypeEditPart.java
@@ -1,833 +1,833 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Generalization_StereotypeLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID),
-				new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public GeneralizationAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																GeneralizationAppliedStereotypeEditPart.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Generalization_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Stereotype";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Generalization_StereotypeLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public GeneralizationAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																GeneralizationAppliedStereotypeEditPart.this),

+														(String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Generalization_Edge, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Stereotype";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationEditPart.java
index 87649caea1e..d94a0791dbf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationEditPart.java
@@ -1,121 +1,121 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-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;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-
-/**
- * @generated
- */
-public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Generalization_Edge";
-
-	/**
-	 * @generated
-	 */
-	public GeneralizationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeLinkLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {
-			((GeneralizationAppliedStereotypeEditPart) childEditPart)
-					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * 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();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public GeneralizationFigure getPrimaryShape() {
-		return (GeneralizationFigure) getFigure();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+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;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+

+/**

+ * @generated

+ */

+public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Generalization_Edge";

+

+	/**

+	 * @generated

+	 */

+	public GeneralizationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {

+			((GeneralizationAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * 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();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public GeneralizationFigure getPrimaryShape() {

+		return (GeneralizationFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPart.java
index d1a16368048..70216fbc1aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPart.java
@@ -1,143 +1,143 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.component.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-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.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-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.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.Messages;
-
-/**
- * @generated
- */
-public class InterfaceAttributeCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_AttributeCompartment";
-
-	/**
-	 * @generated
-	 */
-	public InterfaceAttributeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.InterfaceAttributeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		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.component.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicy());
-
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		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));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+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.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

+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.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.Messages;

+

+/**

+ * @generated

+ */

+public class InterfaceAttributeCompartmentEditPart extends ResizeableListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_AttributeCompartment";

+

+	/**

+	 * @generated

+	 */

+	public InterfaceAttributeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getCompartmentName() {

+		return Messages.InterfaceAttributeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		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.component.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicy());

+

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshBounds() {

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		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));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
index 725c65f360f..4d378229624 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
@@ -1,142 +1,142 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-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.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.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.Messages;
-
-/**
- * @generated
- */
-public class InterfaceAttributeCompartmentEditPartCN extends ListCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_AttributeCompartment_CN";
-
-	/**
-	 * @generated
-	 */
-	public InterfaceAttributeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.InterfaceAttributeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		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.component.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicyCN());
-
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		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));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+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.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.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.Messages;

+

+/**

+ * @generated

+ */

+public class InterfaceAttributeCompartmentEditPartCN extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_AttributeCompartment_CN";

+

+	/**

+	 * @generated

+	 */

+	public InterfaceAttributeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getCompartmentName() {

+		return Messages.InterfaceAttributeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		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.component.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicyCN());

+

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		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));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java
index d91b5911836..71a6bb04cc6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java
@@ -1,281 +1,281 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.BasicCompartment;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class InterfaceEditPart extends RoundedCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_Shape";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public InterfaceEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				String vid = UMLVisualIDRegistry.getVisualID(childView);
-				if (vid != null) {
-					switch (vid) {
-					case InterfaceNameEditPart.VISUAL_ID:
-					case InterfaceFloatingLabelEditPart.VISUAL_ID:
-						return new BorderItemSelectionEditPolicy() {
-
-							@Override
-							protected List<?> createSelectionHandles() {
-								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-								mh.setBorder(null);
-								return Collections.singletonList(mh);
-							}
-						};
-					}
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	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
-		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!
-		 */
-		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 (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new LollipopInterfaceFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure
-	 *
-	 * @generated
-	 */
-	@Override
-	public LollipopInterfaceFigure getPrimaryShape() {
-		return (LollipopInterfaceFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof InterfaceNameEditPart) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else if (borderItemEditPart instanceof InterfaceFloatingLabelEditPart) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else {
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class InterfaceEditPart extends RoundedCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_Shape";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public InterfaceEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

+		// 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);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				String vid = UMLVisualIDRegistry.getVisualID(childView);

+				if (vid != null) {

+					switch (vid) {

+					case InterfaceNameEditPart.VISUAL_ID:

+					case InterfaceFloatingLabelEditPart.VISUAL_ID:

+						return new BorderItemSelectionEditPolicy() {

+

+							@Override

+							protected List<?> createSelectionHandles() {

+								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+								mh.setBorder(null);

+								return Collections.singletonList(mh);

+							}

+						};

+					}

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	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

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		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 (modelChildren.contains(event.getNotifier())) {

+					return;

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createNodeShape() {

+		return primaryShape = new LollipopInterfaceFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure

+	 *

+	 * @generated

+	 */

+	@Override

+	public LollipopInterfaceFigure getPrimaryShape() {

+		return (LollipopInterfaceFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof InterfaceNameEditPart) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if (borderItemEditPart instanceof InterfaceFloatingLabelEditPart) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java
index 1746707a98e..25b20a71cfa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java
@@ -1,283 +1,283 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.BasicCompartment;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class InterfaceEditPartPCN extends RoundedCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_Shape_CN";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public InterfaceEditPartPCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				String vid = UMLVisualIDRegistry.getVisualID(childView);
-				if (vid != null) {
-					switch (vid) {
-					case InterfaceNameEditPartPCN.VISUAL_ID:
-					case InterfaceFloatingLabelEditPartPCN.VISUAL_ID:
-						return new BorderItemSelectionEditPolicy() {
-
-							@Override
-							protected List<?> createSelectionHandles() {
-								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-								mh.setBorder(null);
-								return Collections.singletonList(mh);
-							}
-						};
-					}
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	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
-		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!
-		 */
-		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 (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new LollipopInterfaceFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure
-	 *
-	 * @generated
-	 */
-	@Override
-	public LollipopInterfaceFigure getPrimaryShape() {
-		return (LollipopInterfaceFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof InterfaceNameEditPartPCN) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else if (borderItemEditPart instanceof InterfaceFloatingLabelEditPartPCN) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else {
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPartPCN.VISUAL_ID));
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class InterfaceEditPartPCN extends RoundedCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_Shape_CN";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public InterfaceEditPartPCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

+		// 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);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				String vid = UMLVisualIDRegistry.getVisualID(childView);

+				if (vid != null) {

+					switch (vid) {

+					case InterfaceNameEditPartPCN.VISUAL_ID:

+					case InterfaceFloatingLabelEditPartPCN.VISUAL_ID:

+						return new BorderItemSelectionEditPolicy() {

+

+							@Override

+							protected List<?> createSelectionHandles() {

+								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+								mh.setBorder(null);

+								return Collections.singletonList(mh);

+							}

+						};

+					}

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	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

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		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 (modelChildren.contains(event.getNotifier())) {

+					return;

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createNodeShape() {

+		return primaryShape = new LollipopInterfaceFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure

+	 *

+	 * @generated

+	 */

+	@Override

+	public LollipopInterfaceFigure getPrimaryShape() {

+		return (LollipopInterfaceFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof InterfaceNameEditPartPCN) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if (borderItemEditPart instanceof InterfaceFloatingLabelEditPartPCN) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPartPCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPart.java
index ec35733a4a4..eb6c31a2b86 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPart.java
@@ -1,847 +1,847 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_FloatingNameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceFloatingLabelEditPart.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public InterfaceFloatingLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),
-														InterfaceFloatingLabelEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Interface_Shape, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new PapyrusWrappingLabel();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_FloatingNameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public InterfaceFloatingLabelEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														InterfaceFloatingLabelEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Interface_Shape, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new PapyrusWrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPartPCN.java
index 6d404b76213..fbd130639e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPartPCN.java
@@ -1,849 +1,849 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InterfaceFloatingLabelEditPartPCN extends FloatingLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_FloatingNameLabel_CN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceFloatingLabelEditPartPCN.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public InterfaceFloatingLabelEditPartPCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																InterfaceFloatingLabelEditPartPCN.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Interface_Shape_CN, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new PapyrusWrappingLabel();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InterfaceFloatingLabelEditPartPCN extends FloatingLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_FloatingNameLabel_CN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceFloatingLabelEditPartPCN.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public InterfaceFloatingLabelEditPartPCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																InterfaceFloatingLabelEditPartPCN.this),

+														(String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Interface_Shape_CN, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new PapyrusWrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPart.java
index c6ba812f8db..315b4bc9569 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPart.java
@@ -1,863 +1,863 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-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.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.custom.figure.nodes.InterfaceAsCercle_nameLabel;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InterfaceNameEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry
-						.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceNameEditPart.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public InterfaceNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), InterfaceNameEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Interface_Shape, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new InterfaceAsCercle_nameLabel();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+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.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.custom.figure.nodes.InterfaceAsCercle_nameLabel;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InterfaceNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry

+						.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceNameEditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public InterfaceNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), InterfaceNameEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Interface_Shape, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new InterfaceAsCercle_nameLabel();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Name";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPartPCN.java
index 7a97e22d4ab..9b29672a2c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPartPCN.java
@@ -1,863 +1,863 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-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.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.custom.figure.nodes.InterfaceAsCercle_nameLabel;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InterfaceNameEditPartPCN extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_NameLabel_CN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceNameEditPartPCN.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public InterfaceNameEditPartPCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), InterfaceNameEditPartPCN.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Interface_Shape_CN, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new InterfaceAsCercle_nameLabel();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+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.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.custom.figure.nodes.InterfaceAsCercle_nameLabel;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InterfaceNameEditPartPCN extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_NameLabel_CN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceNameEditPartPCN.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public InterfaceNameEditPartPCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), InterfaceNameEditPartPCN.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Interface_Shape_CN, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new InterfaceAsCercle_nameLabel();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Name";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPart.java
index 4920e1038f1..ac9252a1b29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPart.java
@@ -1,143 +1,143 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.component.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-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.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-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.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.Messages;
-
-/**
- * @generated
- */
-public class InterfaceOperationCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_OperationCompartment";
-
-	/**
-	 * @generated
-	 */
-	public InterfaceOperationCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.InterfaceOperationCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		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.component.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicy());
-
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		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));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+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.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

+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.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.Messages;

+

+/**

+ * @generated

+ */

+public class InterfaceOperationCompartmentEditPart extends ResizeableListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_OperationCompartment";

+

+	/**

+	 * @generated

+	 */

+	public InterfaceOperationCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getCompartmentName() {

+		return Messages.InterfaceOperationCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		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.component.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicy());

+

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshBounds() {

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		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));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java
index e13c5d7cbee..2ba3dc15d5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java
@@ -1,142 +1,142 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-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.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.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.Messages;
-
-/**
- * @generated
- */
-public class InterfaceOperationCompartmentEditPartCN extends ListCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_OperationCompartment_CN";
-
-	/**
-	 * @generated
-	 */
-	public InterfaceOperationCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.InterfaceOperationCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		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.component.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicyCN());
-
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		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));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+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.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.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.Messages;

+

+/**

+ * @generated

+ */

+public class InterfaceOperationCompartmentEditPartCN extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_OperationCompartment_CN";

+

+	/**

+	 * @generated

+	 */

+	public InterfaceOperationCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getCompartmentName() {

+		return Messages.InterfaceOperationCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		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.component.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicyCN());

+

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		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));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java
index e621ca4e200..75e8e1d3139 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java
@@ -1,70 +1,70 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
-
-/**
- * @generated
- */
-public class InterfacePortLinkEditPart extends ConnectionEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Link_InterfacePortEdge";
-
-	/**
-	 * @generated
-	 */
-	public InterfacePortLinkEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());
-		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);
-	}
-
-	/**
-	 * 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 PolylineConnectionEx();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public PolylineConnectionEx getPrimaryShape() {
-		return (PolylineConnectionEx) getFigure();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

+

+/**

+ * @generated

+ */

+public class InterfacePortLinkEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Link_InterfacePortEdge";

+

+	/**

+	 * @generated

+	 */

+	public InterfacePortLinkEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());

+		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);

+	}

+

+	/**

+	 * 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 PolylineConnectionEx();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public PolylineConnectionEx getPrimaryShape() {

+		return (PolylineConnectionEx) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
index 7919594407b..5c5ec63ac24 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
@@ -1,841 +1,841 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "InterfaceRealization_StereotypeLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID),
-				new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated Papyrus Generation
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(
-												ParserUtil.getParserAdapter(getParserElement(),
-														InterfaceRealizationAppliedStereotypeEditPart.this),
-												(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.InterfaceRealization_Edge, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Stereotype";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "InterfaceRealization_StereotypeLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated Papyrus Generation

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														InterfaceRealizationAppliedStereotypeEditPart.this),

+												(String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.InterfaceRealization_Edge, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Stereotype";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationEditPart.java
index a224cb1a0c6..9f53f262fd8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationEditPart.java
@@ -1,125 +1,125 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-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.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.InterfaceRealizationLinkFigure;
-
-/**
- * @generated
- */
-public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "InterfaceRealization_Edge";
-
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeLinkLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InterfaceRealizationNameEditPart) {
-			((InterfaceRealizationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-		}
-		if (childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {
-			((InterfaceRealizationAppliedStereotypeEditPart) childEditPart)
-					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InterfaceRealizationNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * 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 InterfaceRealizationLinkFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public InterfaceRealizationLinkFigure getPrimaryShape() {
-		return (InterfaceRealizationLinkFigure) getFigure();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+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.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.InterfaceRealizationLinkFigure;

+

+/**

+ * @generated

+ */

+public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "InterfaceRealization_Edge";

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof InterfaceRealizationNameEditPart) {

+			((InterfaceRealizationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if (childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {

+			((InterfaceRealizationAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof InterfaceRealizationNameEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * 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 InterfaceRealizationLinkFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public InterfaceRealizationLinkFigure getPrimaryShape() {

+		return (InterfaceRealizationLinkFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationNameEditPart.java
index e8ab3cb0a3c..35da0e5a49e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationNameEditPart.java
@@ -1,842 +1,842 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "InterfaceRealization_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID),
-				new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated Papyrus Generation
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																InterfaceRealizationNameEditPart.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.InterfaceRealization_Edge, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "InterfaceRealization_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID),

+				new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated Papyrus Generation

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																InterfaceRealizationNameEditPart.this),

+														(String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.InterfaceRealization_Edge, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Name";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/LinkDescriptorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/LinkDescriptorEditPart.java
index 8d482102a96..9b3e71a5e12 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/LinkDescriptorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/LinkDescriptorEditPart.java
@@ -1,72 +1,72 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-
-/**
- * @generated
- */
-public class LinkDescriptorEditPart extends ConnectionEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Link_DescriptorEdge";
-
-	/**
-	 * @generated
-	 */
-	public LinkDescriptorEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());
-		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-	}
-
-	/**
-	 * 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();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public SimpleDashedEdgeFigure getPrimaryShape() {
-		return (SimpleDashedEdgeFigure) getFigure();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+

+/**

+ * @generated

+ */

+public class LinkDescriptorEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Link_DescriptorEdge";

+

+	/**

+	 * @generated

+	 */

+	public LinkDescriptorEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());

+		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+	}

+

+	/**

+	 * 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();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public SimpleDashedEdgeFigure getPrimaryShape() {

+		return (SimpleDashedEdgeFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationAppliedStereotypeEditPart.java
index 9ea8f01ed61..7ab4ed46ee7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationAppliedStereotypeEditPart.java
@@ -1,841 +1,841 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Manifestation_StereotypeLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID),
-				new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ManifestationAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																ManifestationAppliedStereotypeEditPart.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Manifestation_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Stereotype";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Manifestation_StereotypeLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ManifestationAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ManifestationAppliedStereotypeEditPart.this),

+														(String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Manifestation_Edge, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Stereotype";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationEditPart.java
index 8ec67ea584b..8a2dcdd0e46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationEditPart.java
@@ -1,127 +1,127 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-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.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-
-/**
- * @generated
- */
-public class ManifestationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Manifestation_Edge";
-
-	/**
-	 * @generated
-	 */
-	public ManifestationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeLinkLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ManifestationNameEditPart) {
-			((ManifestationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-		}
-		if (childEditPart instanceof ManifestationAppliedStereotypeEditPart) {
-			((ManifestationAppliedStereotypeEditPart) childEditPart)
-					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ManifestationNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ManifestationAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * 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();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public DashedEdgeFigure getPrimaryShape() {
-		return (DashedEdgeFigure) getFigure();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+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.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+

+/**

+ * @generated

+ */

+public class ManifestationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Manifestation_Edge";

+

+	/**

+	 * @generated

+	 */

+	public ManifestationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ManifestationNameEditPart) {

+			((ManifestationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if (childEditPart instanceof ManifestationAppliedStereotypeEditPart) {

+			((ManifestationAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ManifestationNameEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ManifestationAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * 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();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public DashedEdgeFigure getPrimaryShape() {

+		return (DashedEdgeFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationNameEditPart.java
index 1619d87b1b3..fc6bdc9f059 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationNameEditPart.java
@@ -1,838 +1,838 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ManifestationNameEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Manifestation_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationNameEditPart.VISUAL_ID),
-				new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ManifestationNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), ManifestationNameEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Manifestation_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ManifestationNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Manifestation_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationNameEditPart.VISUAL_ID),

+				new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ManifestationNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ManifestationNameEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Manifestation_Edge, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Name";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java
index 5852154260a..1f3703ad63a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java
@@ -1,304 +1,304 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.PackageEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ModelEditPart extends PackageEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Model_Shape";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ModelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$
-		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
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @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;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ModelNameEditPart) {
-			((ModelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		if (childEditPart instanceof ModelPackageableElementCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPackageableElementFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
-			pane.add(((ModelPackageableElementCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ModelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ModelPackageableElementCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPackageableElementFigure();
-			pane.remove(((ModelPackageableElementCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ModelPackageableElementCompartmentEditPart) {
-			return getPrimaryShape().getPackageableElementFigure();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ModelNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ModelEditPart extends PackageEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Model_Shape";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ModelEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

+		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

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @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;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ModelNameEditPart) {

+			((ModelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+		if (childEditPart instanceof ModelPackageableElementCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getPackageableElementFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ModelPackageableElementCompartmentEditPart) childEditPart).getFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ModelNameEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ModelPackageableElementCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getPackageableElementFigure();

+			pane.remove(((ModelPackageableElementCompartmentEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ModelPackageableElementCompartmentEditPart) {

+			return getPrimaryShape().getPackageableElementFigure();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);

+		return result;

+	}

+

+	/**

+	 * 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());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if (nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ModelNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java
index 00c45731af3..edd5653dd3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java
@@ -1,304 +1,304 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.PackageEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ModelEditPartCN extends PackageEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Model_Shape_CN";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ModelEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$
-		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
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @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;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ModelNameEditPartCN) {
-			((ModelNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		if (childEditPart instanceof ModelPackageableElementCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getPackageableElementFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
-			pane.add(((ModelPackageableElementCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ModelNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof ModelPackageableElementCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getPackageableElementFigure();
-			pane.remove(((ModelPackageableElementCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ModelPackageableElementCompartmentEditPartCN) {
-			return getPrimaryShape().getPackageableElementFigure();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ModelNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ModelEditPartCN extends PackageEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Model_Shape_CN";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ModelEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

+		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

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @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;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ModelNameEditPartCN) {

+			((ModelNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+		if (childEditPart instanceof ModelPackageableElementCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getPackageableElementFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ModelPackageableElementCompartmentEditPartCN) childEditPart).getFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ModelNameEditPartCN) {

+			return true;

+		}

+		if (childEditPart instanceof ModelPackageableElementCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getPackageableElementFigure();

+			pane.remove(((ModelPackageableElementCompartmentEditPartCN) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ModelPackageableElementCompartmentEditPartCN) {

+			return getPrimaryShape().getPackageableElementFigure();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);

+		return result;

+	}

+

+	/**

+	 * 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());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if (nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ModelNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java
index 096e88d387b..d8e99705e88 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java
@@ -1,885 +1,885 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ModelNameEditPart extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Model_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ModelNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(
-												ParserUtil.getParserAdapter(getParserElement(), ModelNameEditPart.this),
-												(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Model_Shape, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON
-				.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ModelNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Model_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ModelNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(), ModelNameEditPart.this),

+												(String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Model_Shape, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java
index 3d92c48e61c..99ccd098213 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java
@@ -1,884 +1,884 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ModelNameEditPartCN extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Model_NameLabel_CN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ModelNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), ModelNameEditPartCN.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Model_Shape_CN, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON
-				.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ModelNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Model_NameLabel_CN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ModelNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ModelNameEditPartCN.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Model_Shape_CN, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPart.java
index ef7b1d28f19..158429c3295 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPart.java
@@ -1,134 +1,134 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.Messages;
-
-/**
- * @generated
- */
-public class ModelPackageableElementCompartmentEditPart extends LinkLFShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Model_PackagedElementCompartment";
-
-	/**
-	 * @generated
-	 */
-	public ModelPackageableElementCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ModelPackageableElementCompartmentEditPart_title;
-	}
-
-	/**
-	 * @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.component.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		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));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.Messages;

+

+/**

+ * @generated

+ */

+public class ModelPackageableElementCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Model_PackagedElementCompartment";

+

+	/**

+	 * @generated

+	 */

+	public ModelPackageableElementCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getCompartmentName() {

+		return Messages.ModelPackageableElementCompartmentEditPart_title;

+	}

+

+	/**

+	 * @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.component.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		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));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
index dbd3240b474..a417603beb6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
@@ -1,134 +1,134 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.Messages;
-
-/**
- * @generated
- */
-public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Model_PackagedElementCompartment_CN";
-
-	/**
-	 * @generated
-	 */
-	public ModelPackageableElementCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ModelPackageableElementCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @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.component.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyCN());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		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));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.Messages;

+

+/**

+ * @generated

+ */

+public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Model_PackagedElementCompartment_CN";

+

+	/**

+	 * @generated

+	 */

+	public ModelPackageableElementCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getCompartmentName() {

+		return Messages.ModelPackageableElementCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @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.component.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyCN());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		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));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java
index bd5a783c608..e553c6af480 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java
@@ -1,846 +1,846 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Dependency_MultiNameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public MultiDependencyLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),
-														MultiDependencyLabelEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Dependency_Shape, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new WrappingLabel();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Dependency_MultiNameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiDependencyLabelEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														MultiDependencyLabelEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Dependency_Shape, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new WrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java
index 4898a06b09b..c9bc9a50074 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java
@@ -1,872 +1,872 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-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.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.AppliedStereotypePropertyDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextNonResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class OperationForInterfaceEditPart extends UMLCompartmentEditPart
-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Operation_InterfaceOperationLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public OperationForInterfaceEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public DragTracker getDragTracker(Request request) {
-		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {
-			return null;
-		}
-		return new DragEditPartsTrackerEx(this);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypePropertyDisplayEditPolicy());
-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),
-														OperationForInterfaceEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Operation_InterfaceOperationLabel, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {
-			refreshUnderline();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new WrappingLabel();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isSelectable() {
-		return getFigure().isShowing();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.DragTracker;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.requests.SelectionRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+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.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.AppliedStereotypePropertyDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class OperationForInterfaceEditPart extends UMLCompartmentEditPart

+		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Operation_InterfaceOperationLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public OperationForInterfaceEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public DragTracker getDragTracker(Request request) {

+		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {

+			return null;

+		}

+		return new DragEditPartsTrackerEx(this);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

+		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypePropertyDisplayEditPolicy());

+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														OperationForInterfaceEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Operation_InterfaceOperationLabel, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

+			refreshUnderline();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new WrappingLabel();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean isSelectable() {

+		return getFigure().isShowing();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java
index 3ed0991b564..0d77185d9c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java
@@ -1,303 +1,303 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.editparts.PackageEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Package_Shape";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public PackageEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$
-		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
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @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;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof PackageNameEditPart) {
-			((PackageNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		if (childEditPart instanceof PackagePackageableElementCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPackageableElementFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
-			pane.add(((PackagePackageableElementCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof PackageNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof PackagePackageableElementCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPackageableElementFigure();
-			pane.remove(((PackagePackageableElementCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof PackagePackageableElementCompartmentEditPart) {
-			return getPrimaryShape().getPackageableElementFigure();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.editparts.PackageEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Package_Shape";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public PackageEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

+		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

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @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;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof PackageNameEditPart) {

+			((PackageNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+		if (childEditPart instanceof PackagePackageableElementCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getPackageableElementFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((PackagePackageableElementCompartmentEditPart) childEditPart).getFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof PackageNameEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof PackagePackageableElementCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getPackageableElementFigure();

+			pane.remove(((PackagePackageableElementCompartmentEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof PackagePackageableElementCompartmentEditPart) {

+			return getPrimaryShape().getPackageableElementFigure();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);

+		return result;

+	}

+

+	/**

+	 * 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());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if (nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java
index a990dc7f60b..0d0d769170c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java
@@ -1,304 +1,304 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.PackageEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class PackageEditPartCN extends PackageEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Package_Shape_CN";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public PackageEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$
-		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
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @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;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof PackageNameEditPartCN) {
-			((PackageNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		if (childEditPart instanceof PackagePackageableElementCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getPackageableElementFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
-			pane.add(((PackagePackageableElementCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof PackageNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof PackagePackageableElementCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getPackageableElementFigure();
-			pane.remove(((PackagePackageableElementCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof PackagePackageableElementCompartmentEditPartCN) {
-			return getPrimaryShape().getPackageableElementFigure();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class PackageEditPartCN extends PackageEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Package_Shape_CN";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public PackageEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

+		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

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @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;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof PackageNameEditPartCN) {

+			((PackageNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+		if (childEditPart instanceof PackagePackageableElementCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getPackageableElementFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((PackagePackageableElementCompartmentEditPartCN) childEditPart).getFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof PackageNameEditPartCN) {

+			return true;

+		}

+		if (childEditPart instanceof PackagePackageableElementCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getPackageableElementFigure();

+			pane.remove(((PackagePackageableElementCompartmentEditPartCN) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof PackagePackageableElementCompartmentEditPartCN) {

+			return getPrimaryShape().getPackageableElementFigure();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);

+		return result;

+	}

+

+	/**

+	 * 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());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if (nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPart.java
index 1dc9891ca78..c21209f70ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPart.java
@@ -1,884 +1,884 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class PackageNameEditPart extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Package_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public PackageNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), PackageNameEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Package_Shape, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON
-				.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class PackageNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Package_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public PackageNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), PackageNameEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Package_Shape, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java
index 43442a7c346..e5e34b99c1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java
@@ -1,884 +1,884 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class PackageNameEditPartCN extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Package_NameLabel_CN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public PackageNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), PackageNameEditPartCN.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Package_Shape_CN, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON
-				.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class PackageNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Package_NameLabel_CN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public PackageNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), PackageNameEditPartCN.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Package_Shape_CN, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPart.java
index 6b9464496f0..9dda3472215 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPart.java
@@ -1,134 +1,134 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.Messages;
-
-/**
- * @generated
- */
-public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Package_PackagedElementCompartment";
-
-	/**
-	 * @generated
-	 */
-	public PackagePackageableElementCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.PackagePackageableElementCompartmentEditPart_title;
-	}
-
-	/**
-	 * @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.component.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		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));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.Messages;

+

+/**

+ * @generated

+ */

+public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Package_PackagedElementCompartment";

+

+	/**

+	 * @generated

+	 */

+	public PackagePackageableElementCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getCompartmentName() {

+		return Messages.PackagePackageableElementCompartmentEditPart_title;

+	}

+

+	/**

+	 * @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.component.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		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));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
index faaba3c7393..8fbe5839c5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
@@ -1,134 +1,134 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.Messages;
-
-/**
- * @generated
- */
-public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Package_PackagedElementCompartment_CN";
-
-	/**
-	 * @generated
-	 */
-	public PackagePackageableElementCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.PackagePackageableElementCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @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.component.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicyCN());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		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));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+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.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.Messages;

+

+/**

+ * @generated

+ */

+public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Package_PackagedElementCompartment_CN";

+

+	/**

+	 * @generated

+	 */

+	public PackagePackageableElementCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getCompartmentName() {

+		return Messages.PackagePackageableElementCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @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.component.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicyCN());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		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));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortAppliedStereotypeEditPart.java
index b894828eb05..f66c1a720de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortAppliedStereotypeEditPart.java
@@ -1,860 +1,860 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-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.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class PortAppliedStereotypeEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Port_StereotypeLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotypeEditPart.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public PortAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeExternalNodeEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),
-														PortAppliedStereotypeEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Port_Shape, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new AppliedStereotypeWrappingLabelFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Stereotype";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+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.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class PortAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Port_StereotypeLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public PortAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeExternalNodeEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														PortAppliedStereotypeEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Port_Shape, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new AppliedStereotypeWrappingLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Stereotype";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java
index d4a7c0c92ea..86da2cbc283 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java
@@ -1,291 +1,290 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.BasicCompartment;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedBorderNamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PortLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PortFigure;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class PortEditPart extends RoundedBorderNamedElementEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Port_Shape";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public PortEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeIconlDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PortLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedNodeEditPolicy());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				String vid = UMLVisualIDRegistry.getVisualID(childView);
-				if (vid != null) {
-					switch (vid) {
-					case PortNameEditPart.VISUAL_ID:
-					case PortAppliedStereotypeEditPart.VISUAL_ID:
-						return new BorderItemSelectionEditPolicy() {
-
-							@Override
-							protected List<?> createSelectionHandles() {
-								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-								mh.setBorder(null);
-								return Collections.singletonList(mh);
-							}
-						};
-					}
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	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
-		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!
-		 */
-		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 (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new PortFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PortFigure
-	 *
-	 * @generated
-	 */
-	@Override
-	public PortFigure getPrimaryShape() {
-		return (PortFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof PortNameEditPart) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else if (borderItemEditPart instanceof PortAppliedStereotypeEditPart) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else {
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(20, 20);
-		return result;
-	}
-
-	/**
-	 * 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() {
-		NodeFigure figure = createNodePlate();
-		figure.setLayoutManager(new StackLayout());
-		IFigure shape = createNodeShape();
-		figure.add(shape);
-		contentPane = setupContentPane(shape);
-		return figure;
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PortNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedBorderNamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PortLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PortFigure;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class PortEditPart extends RoundedBorderNamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Port_Shape";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public PortEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeIconlDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PortLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedNodeEditPolicy());

+		// 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);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				String vid = UMLVisualIDRegistry.getVisualID(childView);

+				if (vid != null) {

+					switch (vid) {

+					case PortNameEditPart.VISUAL_ID:

+					case PortAppliedStereotypeEditPart.VISUAL_ID:

+						return new BorderItemSelectionEditPolicy() {

+

+							@Override

+							protected List<?> createSelectionHandles() {

+								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+								mh.setBorder(null);

+								return Collections.singletonList(mh);

+							}

+						};

+					}

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	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

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		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 (modelChildren.contains(event.getNotifier())) {

+					return;

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new PortFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PortFigure

+	 *

+	 * @generated

+	 */

+	@Override

+	public PortFigure getPrimaryShape() {

+		return (PortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof PortNameEditPart) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if (borderItemEditPart instanceof PortAppliedStereotypeEditPart) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(20, 20);

+		return result;

+	}

+

+	/**

+	 * 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() {

+		NodeFigure figure = createNodePlate();

+		figure.setLayoutManager(new StackLayout());

+		IFigure shape = createNodeShape();

+		figure.add(shape);

+		contentPane = setupContentPane(shape);

+		return figure;

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PortNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortNameEditPart.java
index e4422890897..ed7f0c113ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortNameEditPart.java
@@ -1,868 +1,868 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPortLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class PortNameEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Port_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry
-						.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public PortNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL, new IndirectPortLabelEditPolicy());
-		installEditPolicy(LabelAlignmentEditPolicy.LABEL_ALIGNMENT_KEY, new LabelAlignmentEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(
-												ParserUtil.getParserAdapter(getParserElement(), PortNameEditPart.this),
-												(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Port_Shape, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new PapyrusWrappingLabel();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPortLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class PortNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Port_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry

+						.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public PortNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL, new IndirectPortLabelEditPolicy());

+		installEditPolicy(LabelAlignmentEditPolicy.LABEL_ALIGNMENT_KEY, new LabelAlignmentEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(), PortNameEditPart.this),

+												(String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Port_Shape, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new PapyrusWrappingLabel();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Name";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java
index 2a2a65e2eec..495120e54cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java
@@ -1,872 +1,872 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-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.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.AppliedStereotypePropertyDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextNonResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart
-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Property_InterfaceAttributeLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public PropertyForInterfaceEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public DragTracker getDragTracker(Request request) {
-		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {
-			return null;
-		}
-		return new DragEditPartsTrackerEx(this);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypePropertyDisplayEditPolicy());
-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),
-														PropertyForInterfaceEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Property_InterfaceAttributeLabel, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {
-			refreshUnderline();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new WrappingLabel();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isSelectable() {
-		return getFigure().isShowing();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.DragTracker;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.requests.SelectionRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+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.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.AppliedStereotypePropertyDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart

+		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Property_InterfaceAttributeLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public PropertyForInterfaceEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public DragTracker getDragTracker(Request request) {

+		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {

+			return null;

+		}

+		return new DragEditPartsTrackerEx(this);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

+		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypePropertyDisplayEditPolicy());

+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														PropertyForInterfaceEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Property_InterfaceAttributeLabel, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

+			refreshUnderline();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new WrappingLabel();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean isSelectable() {

+		return getFigure().isShowing();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java
index 58d005ba0cf..46ea7b3799b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java
@@ -1,328 +1,328 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomPropertyPartEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PropertyPartFigure;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class PropertyPartEditPartCN extends CustomPropertyPartEditPartCN {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Property_Shape";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public PropertyPartEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		// in Papyrus diagrams are not strongly synchronised
-		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.component.edit.policies.PropertyCanonicalEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PropertyLayoutEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,
-				new ShowHideCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				String vid = UMLVisualIDRegistry.getVisualID(childView);
-				if (vid != null) {
-					switch (vid) {
-					case PortEditPart.VISUAL_ID:
-						return new BorderItemResizableEditPolicy();
-					}
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new PropertyPartFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PropertyPartFigure
-	 *
-	 * @generated
-	 */
-	@Override
-	public PropertyPartFigure getPrimaryShape() {
-		return (PropertyPartFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof PropertyPartNameEditPartCN) {
-			((PropertyPartNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		// Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof PropertyPartNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomPropertyPartEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PropertyPartFigure;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class PropertyPartEditPartCN extends CustomPropertyPartEditPartCN {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Property_Shape";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public PropertyPartEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.component.edit.policies.PropertyCanonicalEditPolicy());

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PropertyLayoutEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedNodeEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());

+		// 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);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				String vid = UMLVisualIDRegistry.getVisualID(childView);

+				if (vid != null) {

+					switch (vid) {

+					case PortEditPart.VISUAL_ID:

+						return new BorderItemResizableEditPolicy();

+					}

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createNodeShape() {

+		return primaryShape = new PropertyPartFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PropertyPartFigure

+	 *

+	 * @generated

+	 */

+	@Override

+	public PropertyPartFigure getPrimaryShape() {

+		return (PropertyPartFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof PropertyPartNameEditPartCN) {

+			((PropertyPartNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+		//Papyrus Gencode :Affixed Port locator

+		if (childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof PropertyPartNameEditPartCN) {

+			return true;

+		}

+		if (childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 70);

+		return result;

+	}

+

+	/**

+	 * 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());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if (nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java
index a787282b576..72396e2cc22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java
@@ -1,887 +1,887 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPropertyLabelEditPolicy;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Property_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public PropertyPartNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-		installEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL,
-				new IndirectPropertyLabelEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), PropertyPartNameEditPartCN.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Property_Shape, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON
-				.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPropertyLabelEditPolicy;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Property_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public PropertyPartNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+		installEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL,

+				new IndirectPropertyLabelEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), PropertyPartNameEditPartCN.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Property_Shape, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java
index 6d3574da2ae..7ffbe864441 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java
@@ -1,866 +1,866 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-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.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.component.edit.policies.UMLTextNonResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ReceptionInInterfaceEditPart extends CompartmentEditPart
-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Reception_InterfaceReceptionLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ReceptionInInterfaceEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public DragTracker getDragTracker(Request request) {
-		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {
-			return null;
-		}
-		return new DragEditPartsTrackerEx(this);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),
-														ReceptionInInterfaceEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Reception_InterfaceReceptionLabel, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {
-			refreshUnderline();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new WrappingLabel();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isSelectable() {
-		return getFigure().isShowing();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.DragTracker;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.requests.SelectionRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+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.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.component.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ReceptionInInterfaceEditPart extends CompartmentEditPart

+		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Reception_InterfaceReceptionLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ReceptionInInterfaceEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public DragTracker getDragTracker(Request request) {

+		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {

+			return null;

+		}

+		return new DragEditPartsTrackerEx(this);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

+		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														ReceptionInInterfaceEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Reception_InterfaceReceptionLabel, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

+			refreshUnderline();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new WrappingLabel();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean isSelectable() {

+		return getFigure().isShowing();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java
index cf3f40a3879..995864ac199 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java
@@ -1,402 +1,402 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.BasicCompartment;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure;
-import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class RectangleInterfaceEditPart extends RoundedCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_ClassifierShape";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public RectangleInterfaceEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,
-				new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,
-				new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				String vid = UMLVisualIDRegistry.getVisualID(childView);
-				if (vid != null) {
-					switch (vid) {
-					case RectangleInterfaceFloatingLabelEditPart.VISUAL_ID:
-						return new BorderItemSelectionEditPolicy() {
-
-							@Override
-							protected List<?> createSelectionHandles() {
-								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-								mh.setBorder(null);
-								return Collections.singletonList(mh);
-							}
-						};
-					}
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	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
-		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!
-		 */
-		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 (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new InterfaceFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure
-	 *
-	 * @generated
-	 */
-	@Override
-	public InterfaceFigure getPrimaryShape() {
-		return (InterfaceFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof RectangleInterfaceNameEditPart) {
-			((RectangleInterfaceNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		if (childEditPart instanceof InterfaceAttributeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
-			pane.add(((InterfaceAttributeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-
-		if (childEditPart instanceof InterfaceOperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
-			pane.add(((InterfaceOperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof RectangleInterfaceNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof InterfaceAttributeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
-			pane.remove(((InterfaceAttributeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof InterfaceOperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			pane.remove(((InterfaceOperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof InterfaceAttributeCompartmentEditPart) {
-			return getPrimaryShape().getAttributeCompartmentFigure();
-		}
-		if (editPart instanceof InterfaceOperationCompartmentEditPart) {
-			return getPrimaryShape().getOperationCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof RectangleInterfaceFloatingLabelEditPart) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else {
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(RectangleInterfaceNameEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-		if (request instanceof CreateViewAndElementRequest) {
-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor()
-					.getCreateElementRequestAdapter();
-			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);
-			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_InterfaceAttributeLabel)) {
-				return getChildBySemanticHint(
-						UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPart.VISUAL_ID));
-			}
-			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_InterfaceOperationLabel)) {
-				return getChildBySemanticHint(
-						UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID));
-			}
-			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Reception_InterfaceReceptionLabel)) {
-				return getChildBySemanticHint(
-						UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID));
-			}
-		}
-		return super.getTargetEditPart(request);
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure;

+import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class RectangleInterfaceEditPart extends RoundedCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_ClassifierShape";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public RectangleInterfaceEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

+		// 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);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				String vid = UMLVisualIDRegistry.getVisualID(childView);

+				if (vid != null) {

+					switch (vid) {

+					case RectangleInterfaceFloatingLabelEditPart.VISUAL_ID:

+						return new BorderItemSelectionEditPolicy() {

+

+							@Override

+							protected List<?> createSelectionHandles() {

+								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+								mh.setBorder(null);

+								return Collections.singletonList(mh);

+							}

+						};

+					}

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	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

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		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 (modelChildren.contains(event.getNotifier())) {

+					return;

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createNodeShape() {

+		return primaryShape = new InterfaceFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure

+	 *

+	 * @generated

+	 */

+	@Override

+	public InterfaceFigure getPrimaryShape() {

+		return (InterfaceFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof RectangleInterfaceNameEditPart) {

+			((RectangleInterfaceNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+		if (childEditPart instanceof InterfaceAttributeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((InterfaceAttributeCompartmentEditPart) childEditPart).getFigure());

+			return true;

+		}

+

+		if (childEditPart instanceof InterfaceOperationCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((InterfaceOperationCompartmentEditPart) childEditPart).getFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof RectangleInterfaceNameEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof InterfaceAttributeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

+			pane.remove(((InterfaceAttributeCompartmentEditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof InterfaceOperationCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

+			pane.remove(((InterfaceOperationCompartmentEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof InterfaceAttributeCompartmentEditPart) {

+			return getPrimaryShape().getAttributeCompartmentFigure();

+		}

+		if (editPart instanceof InterfaceOperationCompartmentEditPart) {

+			return getPrimaryShape().getOperationCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof RectangleInterfaceFloatingLabelEditPart) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100);

+		return result;

+	}

+

+	/**

+	 * 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());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if (nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(RectangleInterfaceNameEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+		if (request instanceof CreateViewAndElementRequest) {

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor()

+					.getCreateElementRequestAdapter();

+			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);

+			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_InterfaceAttributeLabel)) {

+				return getChildBySemanticHint(

+						UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPart.VISUAL_ID));

+			}

+			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_InterfaceOperationLabel)) {

+				return getChildBySemanticHint(

+						UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID));

+			}

+			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Reception_InterfaceReceptionLabel)) {

+				return getChildBySemanticHint(

+						UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID));

+			}

+		}

+		return super.getTargetEditPart(request);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java
index 0be129083c4..ea76e8e02b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java
@@ -1,402 +1,402 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.BasicCompartment;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure;
-import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class RectangleInterfaceEditPartCN extends RoundedCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_ClassifierShape_CN";
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public RectangleInterfaceEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,
-				new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,
-				new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());
-		// 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);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				String vid = UMLVisualIDRegistry.getVisualID(childView);
-				if (vid != null) {
-					switch (vid) {
-					case RectangleInterfaceFloatingLabelEditPartCN.VISUAL_ID:
-						return new BorderItemSelectionEditPolicy() {
-
-							@Override
-							protected List<?> createSelectionHandles() {
-								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-								mh.setBorder(null);
-								return Collections.singletonList(mh);
-							}
-						};
-					}
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * Papyrus codeGen
-	 *
-	 * @generated
-	 **/
-	@Override
-	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
-		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!
-		 */
-		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 (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new InterfaceFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure
-	 *
-	 * @generated
-	 */
-	@Override
-	public InterfaceFigure getPrimaryShape() {
-		return (InterfaceFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof RectangleInterfaceNameEditPartCN) {
-			((RectangleInterfaceNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		if (childEditPart instanceof InterfaceAttributeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
-			pane.add(((InterfaceAttributeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-
-		if (childEditPart instanceof InterfaceOperationCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
-			pane.add(((InterfaceOperationCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof RectangleInterfaceNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof InterfaceAttributeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
-			pane.remove(((InterfaceAttributeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof InterfaceOperationCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			pane.remove(((InterfaceOperationCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof InterfaceAttributeCompartmentEditPartCN) {
-			return getPrimaryShape().getAttributeCompartmentFigure();
-		}
-		if (editPart instanceof InterfaceOperationCompartmentEditPartCN) {
-			return getPrimaryShape().getOperationCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof RectangleInterfaceFloatingLabelEditPartCN) {
-			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else {
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected NodeFigure createNodePlate() {
-		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100);
-		return result;
-	}
-
-	/**
-	 * 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());
-
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 *
-	 * @param nodeShape
-	 *            instance of generated figure class
-	 * @generated
-	 */
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setLineType(int style) {
-		if (primaryShape instanceof IPapyrusNodeFigure) {
-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(RectangleInterfaceNameEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-		if (request instanceof CreateViewAndElementRequest) {
-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor()
-					.getCreateElementRequestAdapter();
-			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);
-			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_InterfaceAttributeLabel)) {
-				return getChildBySemanticHint(
-						UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPartCN.VISUAL_ID));
-			}
-			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_InterfaceOperationLabel)) {
-				return getChildBySemanticHint(
-						UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID));
-			}
-			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Reception_InterfaceReceptionLabel)) {
-				return getChildBySemanticHint(
-						UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID));
-			}
-		}
-		return super.getTargetEditPart(request);
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure;

+import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class RectangleInterfaceEditPartCN extends RoundedCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_ClassifierShape_CN";

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public RectangleInterfaceEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

+		// 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);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			@Override

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				String vid = UMLVisualIDRegistry.getVisualID(childView);

+				if (vid != null) {

+					switch (vid) {

+					case RectangleInterfaceFloatingLabelEditPartCN.VISUAL_ID:

+						return new BorderItemSelectionEditPolicy() {

+

+							@Override

+							protected List<?> createSelectionHandles() {

+								MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+								mh.setBorder(null);

+								return Collections.singletonList(mh);

+							}

+						};

+					}

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if (result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			@Override

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			@Override

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	@Override

+	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

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		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 (modelChildren.contains(event.getNotifier())) {

+					return;

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createNodeShape() {

+		return primaryShape = new InterfaceFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure

+	 *

+	 * @generated

+	 */

+	@Override

+	public InterfaceFigure getPrimaryShape() {

+		return (InterfaceFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof RectangleInterfaceNameEditPartCN) {

+			((RectangleInterfaceNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+		if (childEditPart instanceof InterfaceAttributeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((InterfaceAttributeCompartmentEditPartCN) childEditPart).getFigure());

+			return true;

+		}

+

+		if (childEditPart instanceof InterfaceOperationCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((InterfaceOperationCompartmentEditPartCN) childEditPart).getFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof RectangleInterfaceNameEditPartCN) {

+			return true;

+		}

+		if (childEditPart instanceof InterfaceAttributeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

+			pane.remove(((InterfaceAttributeCompartmentEditPartCN) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof InterfaceOperationCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

+			pane.remove(((InterfaceOperationCompartmentEditPartCN) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof InterfaceAttributeCompartmentEditPartCN) {

+			return getPrimaryShape().getAttributeCompartmentFigure();

+		}

+		if (editPart instanceof InterfaceOperationCompartmentEditPartCN) {

+			return getPrimaryShape().getOperationCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof RectangleInterfaceFloatingLabelEditPartCN) {

+			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected NodeFigure createNodePlate() {

+		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100);

+		return result;

+	}

+

+	/**

+	 * 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());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 *

+	 * @param nodeShape

+	 *            instance of generated figure class

+	 * @generated

+	 */

+	@Override

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if (nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setLineType(int style) {

+		if (primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(RectangleInterfaceNameEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+		if (request instanceof CreateViewAndElementRequest) {

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor()

+					.getCreateElementRequestAdapter();

+			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);

+			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_InterfaceAttributeLabel)) {

+				return getChildBySemanticHint(

+						UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPartCN.VISUAL_ID));

+			}

+			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_InterfaceOperationLabel)) {

+				return getChildBySemanticHint(

+						UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID));

+			}

+			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Reception_InterfaceReceptionLabel)) {

+				return getChildBySemanticHint(

+						UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID));

+			}

+		}

+		return super.getTargetEditPart(request);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPart.java
index 995040fded3..483e9951aa2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPart.java
@@ -1,850 +1,850 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class RectangleInterfaceFloatingLabelEditPart extends FloatingLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_ClassifierFloatingNameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceFloatingLabelEditPart.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public RectangleInterfaceFloatingLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																RectangleInterfaceFloatingLabelEditPart.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Interface_ClassifierShape, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new PapyrusWrappingLabel();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class RectangleInterfaceFloatingLabelEditPart extends FloatingLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_ClassifierFloatingNameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public RectangleInterfaceFloatingLabelEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																RectangleInterfaceFloatingLabelEditPart.this),

+														(String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Interface_ClassifierShape, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new PapyrusWrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPartCN.java
index fdfcb1990cf..569f49e3614 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPartCN.java
@@ -1,849 +1,849 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class RectangleInterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_ClassifierFloatingNameLabel_CN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceFloatingLabelEditPartCN.VISUAL_ID),
-				new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public RectangleInterfaceFloatingLabelEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(
-												ParserUtil.getParserAdapter(getParserElement(),
-														RectangleInterfaceFloatingLabelEditPartCN.this),
-												(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Interface_ClassifierShape_CN, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new PapyrusWrappingLabel();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class RectangleInterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_ClassifierFloatingNameLabel_CN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public RectangleInterfaceFloatingLabelEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														RectangleInterfaceFloatingLabelEditPartCN.this),

+												(String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Interface_ClassifierShape_CN, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new PapyrusWrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java
index b4dcd8ec65c..677ebd43935 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java
@@ -1,886 +1,886 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class RectangleInterfaceNameEditPart extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_ClassifierNameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public RectangleInterfaceNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),
-														RectangleInterfaceNameEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Interface_ClassifierShape, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON
-				.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class RectangleInterfaceNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_ClassifierNameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public RectangleInterfaceNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														RectangleInterfaceNameEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Interface_ClassifierShape, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON

+				.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java
index 4727a28a8a0..2a41cb387b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java
@@ -1,870 +1,870 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.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;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-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.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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class RectangleInterfaceNameEditPartCN extends PapyrusCompartmentEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Interface_ClassifierNameLabel_CN";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public RectangleInterfaceNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																RectangleInterfaceNameEditPartCN.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Interface_ClassifierShape_CN, getParserElement(), this,
-					VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.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;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+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.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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class RectangleInterfaceNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Interface_ClassifierNameLabel_CN";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public RectangleInterfaceNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																RectangleInterfaceNameEditPartCN.this),

+														(String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Interface_ClassifierShape_CN, getParserElement(), this,

+					VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

+				setLabelTextHelper(getFigure(), getLabelText());

+				setLabelIconHelper(getFigure(), getLabelIcon());

+			} else {

+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionAppliedStereotypeEditPart.java
index 703411e5205..f36ecff56a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionAppliedStereotypeEditPart.java
@@ -1,841 +1,841 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Substitution_StereotypeLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID),
-				new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public SubstitutionAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(
-														ParserUtil.getParserAdapter(getParserElement(),
-																SubstitutionAppliedStereotypeEditPart.this),
-														(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Substitution_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Stereotype";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Substitution_StereotypeLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SubstitutionAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																SubstitutionAppliedStereotypeEditPart.this),

+														(String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Substitution_Edge, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Stereotype";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionEditPart.java
index 1a144888fd2..4785c7f5e05 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionEditPart.java
@@ -1,127 +1,127 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-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.InterfaceRealizationFigure;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-
-/**
- * @generated
- */
-public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Substitution_Edge";
-
-	/**
-	 * @generated
-	 */
-	public SubstitutionEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeLinkLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof SubstitutionNameEditPart) {
-			((SubstitutionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-		}
-		if (childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {
-			((SubstitutionAppliedStereotypeEditPart) childEditPart)
-					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof SubstitutionNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * 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 InterfaceRealizationFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public InterfaceRealizationFigure getPrimaryShape() {
-		return (InterfaceRealizationFigure) getFigure();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+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.InterfaceRealizationFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+

+/**

+ * @generated

+ */

+public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Substitution_Edge";

+

+	/**

+	 * @generated

+	 */

+	public SubstitutionEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SubstitutionNameEditPart) {

+			((SubstitutionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if (childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {

+			((SubstitutionAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SubstitutionNameEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * 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 InterfaceRealizationFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public InterfaceRealizationFigure getPrimaryShape() {

+		return (InterfaceRealizationFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionNameEditPart.java
index f5a3c9f7aba..335c30f395d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionNameEditPart.java
@@ -1,838 +1,838 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class SubstitutionNameEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Substitution_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionNameEditPart.VISUAL_ID),
-				new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public SubstitutionNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), SubstitutionNameEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Substitution_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class SubstitutionNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Substitution_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionNameEditPart.VISUAL_ID),

+				new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SubstitutionNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), SubstitutionNameEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Substitution_Edge, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Name";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java
index 3ea8c6203f7..6d42e6b58c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java
@@ -1,394 +1,394 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-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.uml.diagram.common.figure.node.IMultilineEditableFigure;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @generated
- */
-public class UMLEditPartFactory implements EditPartFactory {
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart createEditPart(EditPart context, Object model) {
-		if (model instanceof View) {
-			View view = (View) model;
-			switch (UMLVisualIDRegistry.getVisualID(view)) {
-
-			case ComponentDiagramEditPart.VISUAL_ID:
-				return new ComponentDiagramEditPart(view);
-
-			case DependencyNodeEditPart.VISUAL_ID:
-				return new DependencyNodeEditPart(view);
-
-			case MultiDependencyLabelEditPart.VISUAL_ID:
-				return new MultiDependencyLabelEditPart(view);
-
-			case DependencyNodeFloatingLabelEditPart.VISUAL_ID:
-				return new DependencyNodeFloatingLabelEditPart(view);
-
-			case ComponentEditPart.VISUAL_ID:
-				return new ComponentEditPart(view);
-
-			case ComponentNameEditPart.VISUAL_ID:
-				return new ComponentNameEditPart(view);
-
-			case ComponentFloatingLabelEditPart.VISUAL_ID:
-				return new ComponentFloatingLabelEditPart(view);
-
-			case ModelEditPart.VISUAL_ID:
-				return new ModelEditPart(view);
-
-			case ModelNameEditPart.VISUAL_ID:
-				return new ModelNameEditPart(view);
-
-			case PackageEditPart.VISUAL_ID:
-				return new PackageEditPart(view);
-
-			case PackageNameEditPart.VISUAL_ID:
-				return new PackageNameEditPart(view);
-
-			case RectangleInterfaceEditPart.VISUAL_ID:
-				return new RectangleInterfaceEditPart(view);
-
-			case RectangleInterfaceNameEditPart.VISUAL_ID:
-				return new RectangleInterfaceNameEditPart(view);
-
-			case RectangleInterfaceFloatingLabelEditPart.VISUAL_ID:
-				return new RectangleInterfaceFloatingLabelEditPart(view);
-
-			case CommentEditPart.VISUAL_ID:
-				return new CommentEditPart(view);
-
-			case CommentBodyEditPart.VISUAL_ID:
-				return new CommentBodyEditPart(view);
-
-			case ConstraintEditPart.VISUAL_ID:
-				return new ConstraintEditPart(view);
-
-			case ConstraintNameEditPart.VISUAL_ID:
-				return new ConstraintNameEditPart(view);
-
-			case ConstraintSpecificationEditPart.VISUAL_ID:
-				return new ConstraintSpecificationEditPart(view);
-
-			case DefaultNamedElementEditPart.VISUAL_ID:
-				return new DefaultNamedElementEditPart(view);
-
-			case DefaultNamedElementNameEditPart.VISUAL_ID:
-				return new DefaultNamedElementNameEditPart(view);
-
-			case InterfaceEditPart.VISUAL_ID:
-				return new InterfaceEditPart(view);
-
-			case InterfaceNameEditPart.VISUAL_ID:
-				return new InterfaceNameEditPart(view);
-
-			case InterfaceFloatingLabelEditPart.VISUAL_ID:
-				return new InterfaceFloatingLabelEditPart(view);
-
-			case PortEditPart.VISUAL_ID:
-				return new PortEditPart(view);
-
-			case PortNameEditPart.VISUAL_ID:
-				return new PortNameEditPart(view);
-
-			case PortAppliedStereotypeEditPart.VISUAL_ID:
-				return new PortAppliedStereotypeEditPart(view);
-
-			case ModelEditPartCN.VISUAL_ID:
-				return new ModelEditPartCN(view);
-
-			case ModelNameEditPartCN.VISUAL_ID:
-				return new ModelNameEditPartCN(view);
-
-			case PackageEditPartCN.VISUAL_ID:
-				return new PackageEditPartCN(view);
-
-			case PackageNameEditPartCN.VISUAL_ID:
-				return new PackageNameEditPartCN(view);
-
-			case RectangleInterfaceEditPartCN.VISUAL_ID:
-				return new RectangleInterfaceEditPartCN(view);
-
-			case RectangleInterfaceNameEditPartCN.VISUAL_ID:
-				return new RectangleInterfaceNameEditPartCN(view);
-
-			case RectangleInterfaceFloatingLabelEditPartCN.VISUAL_ID:
-				return new RectangleInterfaceFloatingLabelEditPartCN(view);
-
-			case ComponentEditPartCN.VISUAL_ID:
-				return new ComponentEditPartCN(view);
-
-			case ComponentNameEditPartCN.VISUAL_ID:
-				return new ComponentNameEditPartCN(view);
-
-			case ComponentFloatingLabelEditPartCN.VISUAL_ID:
-				return new ComponentFloatingLabelEditPartCN(view);
-
-			case ComponentEditPartPCN.VISUAL_ID:
-				return new ComponentEditPartPCN(view);
-
-			case ComponentNameEditPartPCN.VISUAL_ID:
-				return new ComponentNameEditPartPCN(view);
-
-			case ComponentFloatingLabelEditPartPCN.VISUAL_ID:
-				return new ComponentFloatingLabelEditPartPCN(view);
-
-			case CommentEditPartPCN.VISUAL_ID:
-				return new CommentEditPartPCN(view);
-
-			case CommentBodyEditPartPCN.VISUAL_ID:
-				return new CommentBodyEditPartPCN(view);
-
-			case ConstraintEditPartPCN.VISUAL_ID:
-				return new ConstraintEditPartPCN(view);
-
-			case ConstraintNameEditPartPCN.VISUAL_ID:
-				return new ConstraintNameEditPartPCN(view);
-
-			case ConstraintSpecificationEditPartPCN.VISUAL_ID:
-				return new ConstraintSpecificationEditPartPCN(view);
-
-			case PropertyForInterfaceEditPart.VISUAL_ID:
-				return new PropertyForInterfaceEditPart(view);
-
-			case OperationForInterfaceEditPart.VISUAL_ID:
-				return new OperationForInterfaceEditPart(view);
-
-			case ReceptionInInterfaceEditPart.VISUAL_ID:
-				return new ReceptionInInterfaceEditPart(view);
-
-			case InterfaceEditPartPCN.VISUAL_ID:
-				return new InterfaceEditPartPCN(view);
-
-			case InterfaceNameEditPartPCN.VISUAL_ID:
-				return new InterfaceNameEditPartPCN(view);
-
-			case InterfaceFloatingLabelEditPartPCN.VISUAL_ID:
-				return new InterfaceFloatingLabelEditPartPCN(view);
-
-			case PropertyPartEditPartCN.VISUAL_ID:
-				return new PropertyPartEditPartCN(view);
-
-			case PropertyPartNameEditPartCN.VISUAL_ID:
-				return new PropertyPartNameEditPartCN(view);
-
-			case ComponentCompositeCompartmentEditPart.VISUAL_ID:
-				return new ComponentCompositeCompartmentEditPart(view);
-
-			case ModelPackageableElementCompartmentEditPart.VISUAL_ID:
-				return new ModelPackageableElementCompartmentEditPart(view);
-
-			case PackagePackageableElementCompartmentEditPart.VISUAL_ID:
-				return new PackagePackageableElementCompartmentEditPart(view);
-
-			case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID:
-				return new ModelPackageableElementCompartmentEditPartCN(view);
-
-			case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID:
-				return new PackagePackageableElementCompartmentEditPartCN(view);
-
-			case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new ComponentCompositeCompartmentEditPartCN(view);
-
-			case ComponentCompositeCompartmentEditPartPCN.VISUAL_ID:
-				return new ComponentCompositeCompartmentEditPartPCN(view);
-
-			case InterfaceAttributeCompartmentEditPart.VISUAL_ID:
-				return new InterfaceAttributeCompartmentEditPart(view);
-
-			case InterfaceOperationCompartmentEditPart.VISUAL_ID:
-				return new InterfaceOperationCompartmentEditPart(view);
-
-			case InterfaceAttributeCompartmentEditPartCN.VISUAL_ID:
-				return new InterfaceAttributeCompartmentEditPartCN(view);
-
-			case InterfaceOperationCompartmentEditPartCN.VISUAL_ID:
-				return new InterfaceOperationCompartmentEditPartCN(view);
-
-			case UsageEditPart.VISUAL_ID:
-				return new UsageEditPart(view);
-
-			case UsageNameEditPart.VISUAL_ID:
-				return new UsageNameEditPart(view);
-
-			case UsageAppliedStereotypeEditPart.VISUAL_ID:
-				return new UsageAppliedStereotypeEditPart(view);
-
-			case InterfaceRealizationEditPart.VISUAL_ID:
-				return new InterfaceRealizationEditPart(view);
-
-			case InterfaceRealizationNameEditPart.VISUAL_ID:
-				return new InterfaceRealizationNameEditPart(view);
-
-			case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:
-				return new InterfaceRealizationAppliedStereotypeEditPart(view);
-
-			case GeneralizationEditPart.VISUAL_ID:
-				return new GeneralizationEditPart(view);
-
-			case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:
-				return new GeneralizationAppliedStereotypeEditPart(view);
-
-			case SubstitutionEditPart.VISUAL_ID:
-				return new SubstitutionEditPart(view);
-
-			case SubstitutionNameEditPart.VISUAL_ID:
-				return new SubstitutionNameEditPart(view);
-
-			case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:
-				return new SubstitutionAppliedStereotypeEditPart(view);
-
-			case ManifestationEditPart.VISUAL_ID:
-				return new ManifestationEditPart(view);
-
-			case ManifestationNameEditPart.VISUAL_ID:
-				return new ManifestationNameEditPart(view);
-
-			case ManifestationAppliedStereotypeEditPart.VISUAL_ID:
-				return new ManifestationAppliedStereotypeEditPart(view);
-
-			case ComponentRealizationEditPart.VISUAL_ID:
-				return new ComponentRealizationEditPart(view);
-
-			case ComponentRealizationNameEditPart.VISUAL_ID:
-				return new ComponentRealizationNameEditPart(view);
-
-			case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:
-				return new ComponentRealizationAppliedStereotypeEditPart(view);
-
-			case AbstractionEditPart.VISUAL_ID:
-				return new AbstractionEditPart(view);
-
-			case AbstractionNameEditPart.VISUAL_ID:
-				return new AbstractionNameEditPart(view);
-
-			case AbstractionAppliedStereotypeEditPart.VISUAL_ID:
-				return new AbstractionAppliedStereotypeEditPart(view);
-
-			case LinkDescriptorEditPart.VISUAL_ID:
-				return new LinkDescriptorEditPart(view);
-
-			case CommentAnnotatedElementEditPart.VISUAL_ID:
-				return new CommentAnnotatedElementEditPart(view);
-
-			case ConstraintConstrainedElementEditPart.VISUAL_ID:
-				return new ConstraintConstrainedElementEditPart(view);
-
-			case DependencyEditPart.VISUAL_ID:
-				return new DependencyEditPart(view);
-
-			case DependencyNameEditPart.VISUAL_ID:
-				return new DependencyNameEditPart(view);
-
-			case DependencyAppliedStereotypeEditPart.VISUAL_ID:
-				return new DependencyAppliedStereotypeEditPart(view);
-
-			case DependencyBranchEditPart.VISUAL_ID:
-				return new DependencyBranchEditPart(view);
-
-			case InterfacePortLinkEditPart.VISUAL_ID:
-				return new InterfacePortLinkEditPart(view);
-
-			case ConnectorEditPart.VISUAL_ID:
-				return new ConnectorEditPart(view);
-
-			case ConnectorAppliedStereotypeEditPart.VISUAL_ID:
-				return new ConnectorAppliedStereotypeEditPart(view);
-
-			case ConnectorNameEditPart.VISUAL_ID:
-				return new ConnectorNameEditPart(view);
-
-			}
-		}
-		return createUnrecognizedEditPart(context, model);
-	}
-
-	/**
-	 * @generated
-	 */
-	private EditPart createUnrecognizedEditPart(EditPart context, Object model) {
-		// Handle creation of unrecognized child node EditParts here
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {
-		if (source.getFigure() instanceof IMultilineEditableFigure) {
-			return new MultilineCellEditorLocator((IMultilineEditableFigure) source.getFigure());
-		} else {
-			return CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source);
-
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	static private class MultilineCellEditorLocator implements CellEditorLocator {
-
-		/**
-		 * @generated
-		 */
-		private IMultilineEditableFigure multilineEditableFigure;
-
-		/**
-		 * @generated
-		 */
-		public MultilineCellEditorLocator(IMultilineEditableFigure figure) {
-			this.multilineEditableFigure = figure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public IMultilineEditableFigure getMultilineEditableFigure() {
-			return multilineEditableFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public void relocate(CellEditor celleditor) {
-			Text text = (Text) celleditor.getControl();
-			Rectangle rect = getMultilineEditableFigure().getBounds().getCopy();
-			rect.x = getMultilineEditableFigure().getEditionLocation().x;
-			rect.y = getMultilineEditableFigure().getEditionLocation().y;
-			getMultilineEditableFigure().translateToAbsolute(rect);
-			if (getMultilineEditableFigure().getText().length() > 0) {
-				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);
-			}
-		}
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gef.EditPart;

+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.uml.diagram.common.figure.node.IMultilineEditableFigure;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.Text;

+

+/**

+ * @generated

+ */

+public class UMLEditPartFactory implements EditPartFactory {

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public EditPart createEditPart(EditPart context, Object model) {

+		if (model instanceof View) {

+			View view = (View) model;

+			switch (UMLVisualIDRegistry.getVisualID(view)) {

+

+			case ComponentDiagramEditPart.VISUAL_ID:

+				return new ComponentDiagramEditPart(view);

+

+			case DependencyNodeEditPart.VISUAL_ID:

+				return new DependencyNodeEditPart(view);

+

+			case MultiDependencyLabelEditPart.VISUAL_ID:

+				return new MultiDependencyLabelEditPart(view);

+

+			case DependencyNodeFloatingLabelEditPart.VISUAL_ID:

+				return new DependencyNodeFloatingLabelEditPart(view);

+

+			case ComponentEditPart.VISUAL_ID:

+				return new ComponentEditPart(view);

+

+			case ComponentNameEditPart.VISUAL_ID:

+				return new ComponentNameEditPart(view);

+

+			case ComponentFloatingLabelEditPart.VISUAL_ID:

+				return new ComponentFloatingLabelEditPart(view);

+

+			case ModelEditPart.VISUAL_ID:

+				return new ModelEditPart(view);

+

+			case ModelNameEditPart.VISUAL_ID:

+				return new ModelNameEditPart(view);

+

+			case PackageEditPart.VISUAL_ID:

+				return new PackageEditPart(view);

+

+			case PackageNameEditPart.VISUAL_ID:

+				return new PackageNameEditPart(view);

+

+			case RectangleInterfaceEditPart.VISUAL_ID:

+				return new RectangleInterfaceEditPart(view);

+

+			case RectangleInterfaceNameEditPart.VISUAL_ID:

+				return new RectangleInterfaceNameEditPart(view);

+

+			case RectangleInterfaceFloatingLabelEditPart.VISUAL_ID:

+				return new RectangleInterfaceFloatingLabelEditPart(view);

+

+			case CommentEditPart.VISUAL_ID:

+				return new CommentEditPart(view);

+

+			case CommentBodyEditPart.VISUAL_ID:

+				return new CommentBodyEditPart(view);

+

+			case ConstraintEditPart.VISUAL_ID:

+				return new ConstraintEditPart(view);

+

+			case ConstraintNameEditPart.VISUAL_ID:

+				return new ConstraintNameEditPart(view);

+

+			case ConstraintSpecificationEditPart.VISUAL_ID:

+				return new ConstraintSpecificationEditPart(view);

+

+			case DefaultNamedElementEditPart.VISUAL_ID:

+				return new DefaultNamedElementEditPart(view);

+

+			case DefaultNamedElementNameEditPart.VISUAL_ID:

+				return new DefaultNamedElementNameEditPart(view);

+

+			case InterfaceEditPart.VISUAL_ID:

+				return new InterfaceEditPart(view);

+

+			case InterfaceNameEditPart.VISUAL_ID:

+				return new InterfaceNameEditPart(view);

+

+			case InterfaceFloatingLabelEditPart.VISUAL_ID:

+				return new InterfaceFloatingLabelEditPart(view);

+

+			case PortEditPart.VISUAL_ID:

+				return new PortEditPart(view);

+

+			case PortNameEditPart.VISUAL_ID:

+				return new PortNameEditPart(view);

+

+			case PortAppliedStereotypeEditPart.VISUAL_ID:

+				return new PortAppliedStereotypeEditPart(view);

+

+			case ModelEditPartCN.VISUAL_ID:

+				return new ModelEditPartCN(view);

+

+			case ModelNameEditPartCN.VISUAL_ID:

+				return new ModelNameEditPartCN(view);

+

+			case PackageEditPartCN.VISUAL_ID:

+				return new PackageEditPartCN(view);

+

+			case PackageNameEditPartCN.VISUAL_ID:

+				return new PackageNameEditPartCN(view);

+

+			case RectangleInterfaceEditPartCN.VISUAL_ID:

+				return new RectangleInterfaceEditPartCN(view);

+

+			case RectangleInterfaceNameEditPartCN.VISUAL_ID:

+				return new RectangleInterfaceNameEditPartCN(view);

+

+			case RectangleInterfaceFloatingLabelEditPartCN.VISUAL_ID:

+				return new RectangleInterfaceFloatingLabelEditPartCN(view);

+

+			case ComponentEditPartCN.VISUAL_ID:

+				return new ComponentEditPartCN(view);

+

+			case ComponentNameEditPartCN.VISUAL_ID:

+				return new ComponentNameEditPartCN(view);

+

+			case ComponentFloatingLabelEditPartCN.VISUAL_ID:

+				return new ComponentFloatingLabelEditPartCN(view);

+

+			case ComponentEditPartPCN.VISUAL_ID:

+				return new ComponentEditPartPCN(view);

+

+			case ComponentNameEditPartPCN.VISUAL_ID:

+				return new ComponentNameEditPartPCN(view);

+

+			case ComponentFloatingLabelEditPartPCN.VISUAL_ID:

+				return new ComponentFloatingLabelEditPartPCN(view);

+

+			case CommentEditPartPCN.VISUAL_ID:

+				return new CommentEditPartPCN(view);

+

+			case CommentBodyEditPartPCN.VISUAL_ID:

+				return new CommentBodyEditPartPCN(view);

+

+			case ConstraintEditPartPCN.VISUAL_ID:

+				return new ConstraintEditPartPCN(view);

+

+			case ConstraintNameEditPartPCN.VISUAL_ID:

+				return new ConstraintNameEditPartPCN(view);

+

+			case ConstraintSpecificationEditPartPCN.VISUAL_ID:

+				return new ConstraintSpecificationEditPartPCN(view);

+

+			case PropertyForInterfaceEditPart.VISUAL_ID:

+				return new PropertyForInterfaceEditPart(view);

+

+			case OperationForInterfaceEditPart.VISUAL_ID:

+				return new OperationForInterfaceEditPart(view);

+

+			case ReceptionInInterfaceEditPart.VISUAL_ID:

+				return new ReceptionInInterfaceEditPart(view);

+

+			case InterfaceEditPartPCN.VISUAL_ID:

+				return new InterfaceEditPartPCN(view);

+

+			case InterfaceNameEditPartPCN.VISUAL_ID:

+				return new InterfaceNameEditPartPCN(view);

+

+			case InterfaceFloatingLabelEditPartPCN.VISUAL_ID:

+				return new InterfaceFloatingLabelEditPartPCN(view);

+

+			case PropertyPartEditPartCN.VISUAL_ID:

+				return new PropertyPartEditPartCN(view);

+

+			case PropertyPartNameEditPartCN.VISUAL_ID:

+				return new PropertyPartNameEditPartCN(view);

+

+			case ComponentCompositeCompartmentEditPart.VISUAL_ID:

+				return new ComponentCompositeCompartmentEditPart(view);

+

+			case ModelPackageableElementCompartmentEditPart.VISUAL_ID:

+				return new ModelPackageableElementCompartmentEditPart(view);

+

+			case PackagePackageableElementCompartmentEditPart.VISUAL_ID:

+				return new PackagePackageableElementCompartmentEditPart(view);

+

+			case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID:

+				return new ModelPackageableElementCompartmentEditPartCN(view);

+

+			case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID:

+				return new PackagePackageableElementCompartmentEditPartCN(view);

+

+			case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new ComponentCompositeCompartmentEditPartCN(view);

+

+			case ComponentCompositeCompartmentEditPartPCN.VISUAL_ID:

+				return new ComponentCompositeCompartmentEditPartPCN(view);

+

+			case InterfaceAttributeCompartmentEditPart.VISUAL_ID:

+				return new InterfaceAttributeCompartmentEditPart(view);

+

+			case InterfaceOperationCompartmentEditPart.VISUAL_ID:

+				return new InterfaceOperationCompartmentEditPart(view);

+

+			case InterfaceAttributeCompartmentEditPartCN.VISUAL_ID:

+				return new InterfaceAttributeCompartmentEditPartCN(view);

+

+			case InterfaceOperationCompartmentEditPartCN.VISUAL_ID:

+				return new InterfaceOperationCompartmentEditPartCN(view);

+

+			case UsageEditPart.VISUAL_ID:

+				return new UsageEditPart(view);

+

+			case UsageNameEditPart.VISUAL_ID:

+				return new UsageNameEditPart(view);

+

+			case UsageAppliedStereotypeEditPart.VISUAL_ID:

+				return new UsageAppliedStereotypeEditPart(view);

+

+			case InterfaceRealizationEditPart.VISUAL_ID:

+				return new InterfaceRealizationEditPart(view);

+

+			case InterfaceRealizationNameEditPart.VISUAL_ID:

+				return new InterfaceRealizationNameEditPart(view);

+

+			case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:

+				return new InterfaceRealizationAppliedStereotypeEditPart(view);

+

+			case GeneralizationEditPart.VISUAL_ID:

+				return new GeneralizationEditPart(view);

+

+			case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:

+				return new GeneralizationAppliedStereotypeEditPart(view);

+

+			case SubstitutionEditPart.VISUAL_ID:

+				return new SubstitutionEditPart(view);

+

+			case SubstitutionNameEditPart.VISUAL_ID:

+				return new SubstitutionNameEditPart(view);

+

+			case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:

+				return new SubstitutionAppliedStereotypeEditPart(view);

+

+			case ManifestationEditPart.VISUAL_ID:

+				return new ManifestationEditPart(view);

+

+			case ManifestationNameEditPart.VISUAL_ID:

+				return new ManifestationNameEditPart(view);

+

+			case ManifestationAppliedStereotypeEditPart.VISUAL_ID:

+				return new ManifestationAppliedStereotypeEditPart(view);

+

+			case ComponentRealizationEditPart.VISUAL_ID:

+				return new ComponentRealizationEditPart(view);

+

+			case ComponentRealizationNameEditPart.VISUAL_ID:

+				return new ComponentRealizationNameEditPart(view);

+

+			case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:

+				return new ComponentRealizationAppliedStereotypeEditPart(view);

+

+			case AbstractionEditPart.VISUAL_ID:

+				return new AbstractionEditPart(view);

+

+			case AbstractionNameEditPart.VISUAL_ID:

+				return new AbstractionNameEditPart(view);

+

+			case AbstractionAppliedStereotypeEditPart.VISUAL_ID:

+				return new AbstractionAppliedStereotypeEditPart(view);

+

+			case LinkDescriptorEditPart.VISUAL_ID:

+				return new LinkDescriptorEditPart(view);

+

+			case CommentAnnotatedElementEditPart.VISUAL_ID:

+				return new CommentAnnotatedElementEditPart(view);

+

+			case ConstraintConstrainedElementEditPart.VISUAL_ID:

+				return new ConstraintConstrainedElementEditPart(view);

+

+			case DependencyEditPart.VISUAL_ID:

+				return new DependencyEditPart(view);

+

+			case DependencyNameEditPart.VISUAL_ID:

+				return new DependencyNameEditPart(view);

+

+			case DependencyAppliedStereotypeEditPart.VISUAL_ID:

+				return new DependencyAppliedStereotypeEditPart(view);

+

+			case DependencyBranchEditPart.VISUAL_ID:

+				return new DependencyBranchEditPart(view);

+

+			case InterfacePortLinkEditPart.VISUAL_ID:

+				return new InterfacePortLinkEditPart(view);

+

+			case ConnectorEditPart.VISUAL_ID:

+				return new ConnectorEditPart(view);

+

+			case ConnectorAppliedStereotypeEditPart.VISUAL_ID:

+				return new ConnectorAppliedStereotypeEditPart(view);

+

+			case ConnectorNameEditPart.VISUAL_ID:

+				return new ConnectorNameEditPart(view);

+

+			}

+		}

+		return createUnrecognizedEditPart(context, model);

+	}

+

+	/**

+	 * @generated

+	 */

+	private EditPart createUnrecognizedEditPart(EditPart context, Object model) {

+		// Handle creation of unrecognized child node EditParts here

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {

+		if (source.getFigure() instanceof IMultilineEditableFigure) {

+			return new MultilineCellEditorLocator((IMultilineEditableFigure) source.getFigure());

+		} else {

+			return CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source);

+

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	static private class MultilineCellEditorLocator implements CellEditorLocator {

+

+		/**

+		 * @generated

+		 */

+		private IMultilineEditableFigure multilineEditableFigure;

+

+		/**

+		 * @generated

+		 */

+		public MultilineCellEditorLocator(IMultilineEditableFigure figure) {

+			this.multilineEditableFigure = figure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public IMultilineEditableFigure getMultilineEditableFigure() {

+			return multilineEditableFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public void relocate(CellEditor celleditor) {

+			Text text = (Text) celleditor.getControl();

+			Rectangle rect = getMultilineEditableFigure().getBounds().getCopy();

+			rect.x = getMultilineEditableFigure().getEditionLocation().x;

+			rect.y = getMultilineEditableFigure().getEditionLocation().y;

+			getMultilineEditableFigure().translateToAbsolute(rect);

+			if (getMultilineEditableFigure().getText().length() > 0) {

+				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.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageAppliedStereotypeEditPart.java
index cfecdffeb0d..bcbd0b10b0b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageAppliedStereotypeEditPart.java
@@ -1,839 +1,839 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Usage_StereotypeLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID),
-				new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public UsageAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated Papyrus Generation
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(
-												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),
-														UsageAppliedStereotypeEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Usage_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Stereotype";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Usage_StereotypeLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public UsageAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated Papyrus Generation

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														UsageAppliedStereotypeEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Usage_Edge, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Stereotype";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageEditPart.java
index 2e17f2eed5b..afa9e6985c1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageEditPart.java
@@ -1,126 +1,126 @@
-/**
- * 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.component.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-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.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.UsageLinkFigure;
-
-/**
- * @generated
- */
-public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Usage_Edge";
-
-	/**
-	 * @generated
-	 */
-	public UsageEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,
-				new AppliedStereotypeLinkLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof UsageNameEditPart) {
-			((UsageNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-		}
-		if (childEditPart instanceof UsageAppliedStereotypeEditPart) {
-			((UsageAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof UsageNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof UsageAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * 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 UsageLinkFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public UsageLinkFigure getPrimaryShape() {
-		return (UsageLinkFigure) getFigure();
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+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.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.UsageLinkFigure;

+

+/**

+ * @generated

+ */

+public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Usage_Edge";

+

+	/**

+	 * @generated

+	 */

+	public UsageEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof UsageNameEditPart) {

+			((UsageNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if (childEditPart instanceof UsageAppliedStereotypeEditPart) {

+			((UsageAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if (addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof UsageNameEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof UsageAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeChildVisual(EditPart childEditPart) {

+		if (removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * 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 UsageLinkFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public UsageLinkFigure getPrimaryShape() {

+		return (UsageLinkFigure) getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageNameEditPart.java
index 5925bffbf78..9a49f98a267 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageNameEditPart.java
@@ -1,839 +1,839 @@
-/**
- * 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.component.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-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.component.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class UsageNameEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "Usage_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry
-						.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageNameEditPart.VISUAL_ID),
-				new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public UsageNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated Papyrus Generation
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(
-												ParserUtil.getParserAdapter(getParserElement(), UsageNameEditPart.this),
-												(String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.Usage_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+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.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class UsageNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "Usage_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 *

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 *

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry

+						.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageNameEditPart.VISUAL_ID),

+				new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public UsageNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated Papyrus Generation

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(), UsageNameEditPart.this),

+												(String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.Usage_Edge, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 *

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 *

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 *

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLabelRole() {

+		return "Name";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 317fdb01e6c..eb3a1a5ef0a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -1,655 +1,655 @@
-/**
- * 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.component.edit.policies;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-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.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.component.expressions.UMLOCLFactory;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.ComponentRealization;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Generalization;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.InterfaceRealization;
-import org.eclipse.uml2.uml.Manifestation;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.Substitution;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.Usage;
-
-/**
- * @generated
- */
-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
-	 */
-	private final IElementType myElementType;
-
-	/**
-	 * @generated
-	 */
-	protected UMLBaseItemSemanticEditPolicy(IElementType elementType) {
-		myElementType = elementType;
-	}
-
-	/**
-	 * Extended request data key to hold editpart visual id.
-	 * Add visual id of edited editpart to extended data of the request
-	 * so command switch can decide what kind of diagram element is being edited.
-	 * 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
-	 *
-	 * @generated
-	 */
-	@Override
-	@SuppressWarnings("unchecked")
-	public Command getCommand(Request request) {
-		if (request instanceof ReconnectRequest) {
-			Object view = ((ReconnectRequest) request).getConnectionEditPart().getModel();
-			if (view instanceof View) {
-				String id = UMLVisualIDRegistry.getVisualID((View) view);
-				request.getExtendedData().put(VISUAL_ID_KEY, id);
-				request.getExtendedData().put(GRAPHICAL_RECONNECTED_EDGE, view);
-			}
-		}
-		return super.getCommand(request);
-	}
-
-	/**
-	 * Returns visual id from request parameters.
-	 *
-	 * @generated
-	 */
-	protected String getVisualID(IEditCommandRequest request) {
-		return (String) request.getParameter(VISUAL_ID_KEY);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected Command getSemanticCommand(IEditCommandRequest request) {
-		IEditCommandRequest completedRequest = completeRequest(request);
-		Command semanticCommand = getSemanticCommandSwitch(completedRequest);
-		semanticCommand = getEditHelperCommand(completedRequest, semanticCommand);
-		if (completedRequest instanceof DestroyRequest) {
-			DestroyRequest destroyRequest = (DestroyRequest) completedRequest;
-			return shouldProceed(destroyRequest) ? addDeleteViewCommand(semanticCommand, destroyRequest) : null;
-		}
-		return semanticCommand;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command addDeleteViewCommand(Command mainCommand, DestroyRequest completedRequest) {
-		Command deleteViewCommand = getGEFWrapper(new DeleteCommand(getEditingDomain(), (View) getHost().getModel()));
-		return mainCommand == null ? deleteViewCommand : mainCommand.chain(deleteViewCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	private Command getEditHelperCommand(IEditCommandRequest request, Command editPolicyCommand) {
-		if (editPolicyCommand != null) {
-			ICommand command = editPolicyCommand instanceof ICommandProxy
-					? ((ICommandProxy) editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand);
-			request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, command);
-		}
-		IElementType requestContextElementType = getContextElementType(request);
-		request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, requestContextElementType);
-		ICommand command = requestContextElementType.getEditCommand(request);
-		request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, null);
-		request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, null);
-		if (command != null) {
-			if (!(command instanceof CompositeTransactionalCommand)) {
-				command = new CompositeTransactionalCommand(getEditingDomain(), command.getLabel()).compose(command);
-			}
-			return new ICommandProxy(command);
-		}
-		return editPolicyCommand;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IElementType getContextElementType(IEditCommandRequest request) {
-		IElementType requestContextElementType = UMLElementTypes.getElementType(getVisualID(request));
-		return requestContextElementType != null ? requestContextElementType : myElementType;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getSemanticCommandSwitch(IEditCommandRequest req) {
-		if (req instanceof CreateRelationshipRequest) {
-			return getCreateRelationshipCommand((CreateRelationshipRequest) req);
-		} else if (req instanceof CreateElementRequest) {
-			return getCreateCommand((CreateElementRequest) req);
-		} else if (req instanceof ConfigureRequest) {
-			return getConfigureCommand((ConfigureRequest) req);
-		} else if (req instanceof DestroyElementRequest) {
-			return getDestroyElementCommand((DestroyElementRequest) req);
-		} else if (req instanceof DestroyReferenceRequest) {
-			return getDestroyReferenceCommand((DestroyReferenceRequest) req);
-		} else if (req instanceof DuplicateElementsRequest) {
-			return getDuplicateCommand((DuplicateElementsRequest) req);
-		} else if (req instanceof GetEditContextRequest) {
-			return getEditContextCommand((GetEditContextRequest) req);
-		} else if (req instanceof MoveRequest) {
-			return getMoveCommand((MoveRequest) req);
-		} else if (req instanceof ReorientReferenceRelationshipRequest) {
-			return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req);
-		} else if (req instanceof ReorientRelationshipRequest) {
-			return getReorientRelationshipCommand((ReorientRelationshipRequest) req);
-		} else if (req instanceof SetRequest) {
-			return getSetCommand((SetRequest) req);
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getConfigureCommand(ConfigureRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType instanceof IElementType) {
-			IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(req.getContainer());
-			if (commandProvider != null) {
-				ICommand command = commandProvider.getEditCommand(req);
-				if (command != null && command.canExecute()) {
-					return new ICommandProxy(command);
-				}
-			}
-		}
-		return null;
-	}
-
-	// RS: End of add code for extended types
-	/**
-	 * @generated
-	 */
-	protected Command getSetCommand(SetRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getEditContextCommand(GetEditContextRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDuplicateCommand(DuplicateElementsRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getMoveCommand(MoveRequest req) {
-		EObject targetCEObject = req.getTargetContainer();
-		if (targetCEObject != null) {
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject);
-			if (provider != null) {
-				ICommand moveCommand = provider.getEditCommand(req);
-				if (moveCommand != null) {
-					return new ICommandProxy(moveCommand);
-				}
-			}
-			return UnexecutableCommand.INSTANCE;
-		} else {
-			return getGEFWrapper(new MoveElementsCommand(req));
-		}
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final Command getGEFWrapper(ICommand cmd) {
-		return (cmd == null) ? UnexecutableCommand.INSTANCE : new ICommandProxy(cmd);
-	}
-
-	/**
-	 * Returns editing domain from the host edit part.
-	 *
-	 * @generated
-	 */
-	protected TransactionalEditingDomain getEditingDomain() {
-		return ((IGraphicalEditPart) getHost()).getEditingDomain();
-	}
-
-	/**
-	 * 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() //$NON-NLS-1$
-					|| nextView.getElement() != view.getElement()) {
-				continue;
-			}
-			cmd.add(new DeleteCommand(getEditingDomain(), nextView));
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public static LinkConstraints getLinkConstraints() {
-		LinkConstraints cached = UMLDiagramEditorPlugin.getInstance().getLinkConstraints();
-		if (cached == null) {
-			UMLDiagramEditorPlugin.getInstance().setLinkConstraints(cached = new LinkConstraints());
-		}
-		return cached;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static class LinkConstraints {
-
-		/**
-		 * @generated
-		 */
-		public LinkConstraints() { // use static method #getLinkConstraints() to access instance
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateUsage_Edge(Package container, NamedElement source, NamedElement target) {
-			return canExistUsage_Edge(container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateInterfaceRealization_Edge(Package container, NamedElement source, Interface target) {
-			return canExistInterfaceRealization_Edge(container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateGeneralization_Edge(Classifier container, Classifier source, Classifier target) {
-			return canExistGeneralization_Edge(container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateSubstitution_Edge(Package container, NamedElement source, NamedElement target) {
-			return canExistSubstitution_Edge(container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateManifestation_Edge(Package container, NamedElement source, NamedElement target) {
-			return canExistManifestation_Edge(container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateComponentRealization_Edge(Package container, NamedElement source, NamedElement target) {
-			return canExistComponentRealization_Edge(container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateAbstraction_Edge(Package container, NamedElement source, NamedElement target) {
-			return canExistAbstraction_Edge(container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateLink_DescriptorEdge() {
-			return canExistLink_DescriptorEdge();
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateComment_AnnotatedElementEdge(Comment source, Element target) {
-			if (source != null) {
-				if (source.getAnnotatedElements().contains(target)) {
-					return false;
-				}
-			}
-
-			return canExistComment_AnnotatedElementEdge(source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateConstraint_ConstrainedElementEdge(Constraint source, Element target) {
-			if (source != null) {
-				if (source.getConstrainedElements().contains(target)) {
-					return false;
-				}
-			}
-
-			return canExistConstraint_ConstrainedElementEdge(source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateDependency_Edge(Package container, NamedElement source, NamedElement 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);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateLink_InterfacePortEdge() {
-			return canExistLink_InterfacePortEdge();
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateConnector_Edge(StructuredClassifier container, ConnectorEnd source,
-				ConnectorEnd target) {
-			return canExistConnector_Edge(container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistUsage_Edge(Package container, Usage linkInstance, NamedElement source,
-				NamedElement target) {
-			try {
-				if (source == null) {
-					return true;
-				} else {
-					Map<String, EClassifier> env = Collections.<String, EClassifier> singletonMap("oppositeEnd", //$NON-NLS-1$
-							UMLPackage.eINSTANCE.getNamedElement());
-					Object sourceVal = UMLOCLFactory.getExpression(7, UMLPackage.eINSTANCE.getNamedElement(), env)
-							.evaluate(source, Collections.singletonMap("oppositeEnd", target)); //$NON-NLS-1$
-					if (false == sourceVal instanceof Boolean || !((Boolean) sourceVal).booleanValue()) {
-						return false;
-					} // else fall-through
-				}
-				if (target == null) {
-					return true;
-				} else {
-					Map<String, EClassifier> env = Collections.<String, EClassifier> singletonMap("oppositeEnd", //$NON-NLS-1$
-							UMLPackage.eINSTANCE.getNamedElement());
-					Object targetVal = UMLOCLFactory.getExpression(6, UMLPackage.eINSTANCE.getNamedElement(), env)
-							.evaluate(target, Collections.singletonMap("oppositeEnd", source)); //$NON-NLS-1$
-					if (false == targetVal instanceof Boolean || !((Boolean) targetVal).booleanValue()) {
-						return false;
-					} // else fall-through
-				}
-				return true;
-			} catch (Exception e) {
-				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$
-				return false;
-			}
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistInterfaceRealization_Edge(Package container, InterfaceRealization linkInstance,
-				NamedElement source, Interface target) {
-			try {
-				if (source == null) {
-					return true;
-				} else {
-					Map<String, EClassifier> env = Collections.<String, EClassifier> singletonMap("oppositeEnd", //$NON-NLS-1$
-							UMLPackage.eINSTANCE.getInterface());
-					Object sourceVal = UMLOCLFactory.getExpression(7, UMLPackage.eINSTANCE.getNamedElement(), env)
-							.evaluate(source, Collections.singletonMap("oppositeEnd", target)); //$NON-NLS-1$
-					if (false == sourceVal instanceof Boolean || !((Boolean) sourceVal).booleanValue()) {
-						return false;
-					} // else fall-through
-				}
-				if (target == null) {
-					return true;
-				} else {
-					Map<String, EClassifier> env = Collections.<String, EClassifier> singletonMap("oppositeEnd", //$NON-NLS-1$
-							UMLPackage.eINSTANCE.getNamedElement());
-					Object targetVal = UMLOCLFactory.getExpression(6, UMLPackage.eINSTANCE.getInterface(), env)
-							.evaluate(target, Collections.singletonMap("oppositeEnd", source)); //$NON-NLS-1$
-					if (false == targetVal instanceof Boolean || !((Boolean) targetVal).booleanValue()) {
-						return false;
-					} // else fall-through
-				}
-				return true;
-			} catch (Exception e) {
-				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$
-				return false;
-			}
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistGeneralization_Edge(Classifier container, Generalization linkInstance, Classifier source,
-				Classifier target) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistSubstitution_Edge(Package container, Substitution linkInstance, NamedElement source,
-				NamedElement target) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistManifestation_Edge(Package container, Manifestation linkInstance, NamedElement source,
-				NamedElement target) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistComponentRealization_Edge(Package container, ComponentRealization linkInstance,
-				NamedElement source, NamedElement target) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistAbstraction_Edge(Package container, Abstraction linkInstance, NamedElement source,
-				NamedElement target) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistLink_DescriptorEdge() {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistComment_AnnotatedElementEdge(Comment source, Element target) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistConstraint_ConstrainedElementEdge(Constraint source, Element target) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistDependency_Edge(Package container, Dependency linkInstance, NamedElement source,
-				NamedElement target) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistDependency_BranchEdge(Package container, Dependency linkInstance, NamedElement source,
-				NamedElement target) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistLink_InterfacePortEdge() {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistConnector_Edge(StructuredClassifier container, Connector linkInstance,
-				ConnectorEnd source, ConnectorEnd target) {
-			return true;
-		}
-	}
-}
+/**

+ * 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.component.edit.policies;

+

+import java.util.Collections;

+import java.util.Iterator;

+import java.util.Map;

+

+import org.eclipse.emf.ecore.EClassifier;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gef.requests.ReconnectRequest;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+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.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.component.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.uml2.uml.Abstraction;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.ComponentRealization;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.ConnectorEnd;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.Generalization;

+import org.eclipse.uml2.uml.Interface;

+import org.eclipse.uml2.uml.InterfaceRealization;

+import org.eclipse.uml2.uml.Manifestation;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.Substitution;

+import org.eclipse.uml2.uml.UMLPackage;

+import org.eclipse.uml2.uml.Usage;

+

+/**

+ * @generated

+ */

+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

+	 */

+	private final IElementType myElementType;

+

+	/**

+	 * @generated

+	 */

+	protected UMLBaseItemSemanticEditPolicy(IElementType elementType) {

+		myElementType = elementType;

+	}

+

+	/**

+	 * Extended request data key to hold editpart visual id.

+	 * Add visual id of edited editpart to extended data of the request

+	 * so command switch can decide what kind of diagram element is being edited.

+	 * 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

+	 *

+	 * @generated

+	 */

+	@Override

+	@SuppressWarnings("unchecked")

+	public Command getCommand(Request request) {

+		if (request instanceof ReconnectRequest) {

+			Object view = ((ReconnectRequest) request).getConnectionEditPart().getModel();

+			if (view instanceof View) {

+				String id = UMLVisualIDRegistry.getVisualID((View) view);

+				request.getExtendedData().put(VISUAL_ID_KEY, id);

+				request.getExtendedData().put(GRAPHICAL_RECONNECTED_EDGE, view);

+			}

+		}

+		return super.getCommand(request);

+	}

+

+	/**

+	 * Returns visual id from request parameters.

+	 *

+	 * @generated

+	 */

+	protected String getVisualID(IEditCommandRequest request) {

+		return (String) request.getParameter(VISUAL_ID_KEY);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected Command getSemanticCommand(IEditCommandRequest request) {

+		IEditCommandRequest completedRequest = completeRequest(request);

+		Command semanticCommand = getSemanticCommandSwitch(completedRequest);

+		semanticCommand = getEditHelperCommand(completedRequest, semanticCommand);

+		if (completedRequest instanceof DestroyRequest) {

+			DestroyRequest destroyRequest = (DestroyRequest) completedRequest;

+			return shouldProceed(destroyRequest) ? addDeleteViewCommand(semanticCommand, destroyRequest) : null;

+		}

+		return semanticCommand;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command addDeleteViewCommand(Command mainCommand, DestroyRequest completedRequest) {

+		Command deleteViewCommand = getGEFWrapper(new DeleteCommand(getEditingDomain(), (View) getHost().getModel()));

+		return mainCommand == null ? deleteViewCommand : mainCommand.chain(deleteViewCommand);

+	}

+

+	/**

+	 * @generated

+	 */

+	private Command getEditHelperCommand(IEditCommandRequest request, Command editPolicyCommand) {

+		if (editPolicyCommand != null) {

+			ICommand command = editPolicyCommand instanceof ICommandProxy

+					? ((ICommandProxy) editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand);

+			request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, command);

+		}

+		IElementType requestContextElementType = getContextElementType(request);

+		request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, requestContextElementType);

+		ICommand command = requestContextElementType.getEditCommand(request);

+		request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, null);

+		request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, null);

+		if (command != null) {

+			if (!(command instanceof CompositeTransactionalCommand)) {

+				command = new CompositeTransactionalCommand(getEditingDomain(), command.getLabel()).compose(command);

+			}

+			return new ICommandProxy(command);

+		}

+		return editPolicyCommand;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IElementType getContextElementType(IEditCommandRequest request) {

+		IElementType requestContextElementType = UMLElementTypes.getElementType(getVisualID(request));

+		return requestContextElementType != null ? requestContextElementType : myElementType;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getSemanticCommandSwitch(IEditCommandRequest req) {

+		if (req instanceof CreateRelationshipRequest) {

+			return getCreateRelationshipCommand((CreateRelationshipRequest) req);

+		} else if (req instanceof CreateElementRequest) {

+			return getCreateCommand((CreateElementRequest) req);

+		} else if (req instanceof ConfigureRequest) {

+			return getConfigureCommand((ConfigureRequest) req);

+		} else if (req instanceof DestroyElementRequest) {

+			return getDestroyElementCommand((DestroyElementRequest) req);

+		} else if (req instanceof DestroyReferenceRequest) {

+			return getDestroyReferenceCommand((DestroyReferenceRequest) req);

+		} else if (req instanceof DuplicateElementsRequest) {

+			return getDuplicateCommand((DuplicateElementsRequest) req);

+		} else if (req instanceof GetEditContextRequest) {

+			return getEditContextCommand((GetEditContextRequest) req);

+		} else if (req instanceof MoveRequest) {

+			return getMoveCommand((MoveRequest) req);

+		} else if (req instanceof ReorientReferenceRelationshipRequest) {

+			return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req);

+		} else if (req instanceof ReorientRelationshipRequest) {

+			return getReorientRelationshipCommand((ReorientRelationshipRequest) req);

+		} else if (req instanceof SetRequest) {

+			return getSetCommand((SetRequest) req);

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getConfigureCommand(ConfigureRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if (requestElementType instanceof IElementType) {

+			IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(req.getContainer());

+			if (commandProvider != null) {

+				ICommand command = commandProvider.getEditCommand(req);

+				if (command != null && command.canExecute()) {

+					return new ICommandProxy(command);

+				}

+			}

+		}

+		return null;

+	}

+

+	// RS: End of add code for extended types

+	/**

+	 * @generated

+	 */

+	protected Command getSetCommand(SetRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getEditContextCommand(GetEditContextRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDuplicateCommand(DuplicateElementsRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getMoveCommand(MoveRequest req) {

+		EObject targetCEObject = req.getTargetContainer();

+		if (targetCEObject != null) {

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject);

+			if (provider != null) {

+				ICommand moveCommand = provider.getEditCommand(req);

+				if (moveCommand != null) {

+					return new ICommandProxy(moveCommand);

+				}

+			}

+			return UnexecutableCommand.INSTANCE;

+		} else {

+			return getGEFWrapper(new MoveElementsCommand(req));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected final Command getGEFWrapper(ICommand cmd) {

+		return (cmd == null) ? UnexecutableCommand.INSTANCE : new ICommandProxy(cmd);

+	}

+

+	/**

+	 * Returns editing domain from the host edit part.

+	 *

+	 * @generated

+	 */

+	protected TransactionalEditingDomain getEditingDomain() {

+		return ((IGraphicalEditPart) getHost()).getEditingDomain();

+	}

+

+	/**

+	 * 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() //$NON-NLS-1$

+					|| nextView.getElement() != view.getElement()) {

+				continue;

+			}

+			cmd.add(new DeleteCommand(getEditingDomain(), nextView));

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static LinkConstraints getLinkConstraints() {

+		LinkConstraints cached = UMLDiagramEditorPlugin.getInstance().getLinkConstraints();

+		if (cached == null) {

+			UMLDiagramEditorPlugin.getInstance().setLinkConstraints(cached = new LinkConstraints());

+		}

+		return cached;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static class LinkConstraints {

+

+		/**

+		 * @generated

+		 */

+		public LinkConstraints() { // use static method #getLinkConstraints() to access instance

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateUsage_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistUsage_Edge(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateInterfaceRealization_Edge(Package container, NamedElement source, Interface target) {

+			return canExistInterfaceRealization_Edge(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateGeneralization_Edge(Classifier container, Classifier source, Classifier target) {

+			return canExistGeneralization_Edge(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateSubstitution_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistSubstitution_Edge(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateManifestation_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistManifestation_Edge(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateComponentRealization_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistComponentRealization_Edge(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateAbstraction_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistAbstraction_Edge(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateLink_DescriptorEdge() {

+			return canExistLink_DescriptorEdge();

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateComment_AnnotatedElementEdge(Comment source, Element target) {

+			if (source != null) {

+				if (source.getAnnotatedElements().contains(target)) {

+					return false;

+				}

+			}

+

+			return canExistComment_AnnotatedElementEdge(source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateConstraint_ConstrainedElementEdge(Constraint source, Element target) {

+			if (source != null) {

+				if (source.getConstrainedElements().contains(target)) {

+					return false;

+				}

+			}

+

+			return canExistConstraint_ConstrainedElementEdge(source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateDependency_Edge(Package container, NamedElement source, NamedElement 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);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateLink_InterfacePortEdge() {

+			return canExistLink_InterfacePortEdge();

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateConnector_Edge(StructuredClassifier container, ConnectorEnd source,

+				ConnectorEnd target) {

+			return canExistConnector_Edge(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistUsage_Edge(Package container, Usage linkInstance, NamedElement source,

+				NamedElement target) {

+			try {

+				if (source == null) {

+					return true;

+				} else {

+					Map<String, EClassifier> env = Collections.<String, EClassifier>singletonMap("oppositeEnd", //$NON-NLS-1$

+							UMLPackage.eINSTANCE.getNamedElement());

+					Object sourceVal = UMLOCLFactory.getExpression(7, UMLPackage.eINSTANCE.getNamedElement(), env)

+							.evaluate(source, Collections.singletonMap("oppositeEnd", target)); //$NON-NLS-1$

+					if (false == sourceVal instanceof Boolean || !((Boolean) sourceVal).booleanValue()) {

+						return false;

+					} // else fall-through

+				}

+				if (target == null) {

+					return true;

+				} else {

+					Map<String, EClassifier> env = Collections.<String, EClassifier>singletonMap("oppositeEnd", //$NON-NLS-1$

+							UMLPackage.eINSTANCE.getNamedElement());

+					Object targetVal = UMLOCLFactory.getExpression(6, UMLPackage.eINSTANCE.getNamedElement(), env)

+							.evaluate(target, Collections.singletonMap("oppositeEnd", source)); //$NON-NLS-1$

+					if (false == targetVal instanceof Boolean || !((Boolean) targetVal).booleanValue()) {

+						return false;

+					} // else fall-through

+				}

+				return true;

+			} catch (Exception e) {

+				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

+				return false;

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistInterfaceRealization_Edge(Package container, InterfaceRealization linkInstance,

+				NamedElement source, Interface target) {

+			try {

+				if (source == null) {

+					return true;

+				} else {

+					Map<String, EClassifier> env = Collections.<String, EClassifier>singletonMap("oppositeEnd", //$NON-NLS-1$

+							UMLPackage.eINSTANCE.getInterface());

+					Object sourceVal = UMLOCLFactory.getExpression(7, UMLPackage.eINSTANCE.getNamedElement(), env)

+							.evaluate(source, Collections.singletonMap("oppositeEnd", target)); //$NON-NLS-1$

+					if (false == sourceVal instanceof Boolean || !((Boolean) sourceVal).booleanValue()) {

+						return false;

+					} // else fall-through

+				}

+				if (target == null) {

+					return true;

+				} else {

+					Map<String, EClassifier> env = Collections.<String, EClassifier>singletonMap("oppositeEnd", //$NON-NLS-1$

+							UMLPackage.eINSTANCE.getNamedElement());

+					Object targetVal = UMLOCLFactory.getExpression(6, UMLPackage.eINSTANCE.getInterface(), env)

+							.evaluate(target, Collections.singletonMap("oppositeEnd", source)); //$NON-NLS-1$

+					if (false == targetVal instanceof Boolean || !((Boolean) targetVal).booleanValue()) {

+						return false;

+					} // else fall-through

+				}

+				return true;

+			} catch (Exception e) {

+				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

+				return false;

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistGeneralization_Edge(Classifier container, Generalization linkInstance, Classifier source,

+				Classifier target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistSubstitution_Edge(Package container, Substitution linkInstance, NamedElement source,

+				NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistManifestation_Edge(Package container, Manifestation linkInstance, NamedElement source,

+				NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistComponentRealization_Edge(Package container, ComponentRealization linkInstance,

+				NamedElement source, NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistAbstraction_Edge(Package container, Abstraction linkInstance, NamedElement source,

+				NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistLink_DescriptorEdge() {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistComment_AnnotatedElementEdge(Comment source, Element target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistConstraint_ConstrainedElementEdge(Constraint source, Element target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistDependency_Edge(Package container, Dependency linkInstance, NamedElement source,

+				NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistDependency_BranchEdge(Package container, Dependency linkInstance, NamedElement source,

+				NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistLink_InterfacePortEdge() {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistConnector_Edge(StructuredClassifier container, Connector linkInstance,

+				ConnectorEnd source, ConnectorEnd target) {

+			return true;

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLTextNonResizableEditPolicy.java
index 660e5bac471..496e8b7b2e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLTextNonResizableEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLTextNonResizableEditPolicy.java
@@ -1,243 +1,243 @@
-/**
- * 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.component.edit.policies;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-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;
-
-/**
- * @generated
- */
-public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx implements IRefreshableFeedbackEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	private IFigure selectionFeedbackFigure;
-
-	/**
-	 * @generated
-	 */
-	private IFigure focusFeedbackFigure;
-
-	/**
-	 * @generated
-	 */
-	private FigureListener hostPositionListener;
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void showPrimarySelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(true);
-			((WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			showSelection();
-			showFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void showSelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(true);
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			hideSelection();
-			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
-			getHostFigure().addFigureListener(getHostPositionListener());
-			refreshSelectionFeedback();
-			hideFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void hideSelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(false);
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (selectionFeedbackFigure != null) {
-				removeFeedback(selectionFeedbackFigure);
-				getHostFigure().removeFigureListener(getHostPositionListener());
-				selectionFeedbackFigure = null;
-			}
-			hideFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void showFocus() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			hideFocus();
-			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
-			refreshFocusFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void hideFocus() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (focusFeedbackFigure != null) {
-				removeFeedback(focusFeedbackFigure);
-				focusFeedbackFigure = null;
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Rectangle getFeedbackBounds() {
-		Rectangle bounds;
-		if (getHostFigure() instanceof Label) {
-			bounds = ((Label) getHostFigure()).getTextBounds();
-			bounds.intersect(getHostFigure().getBounds());
-		} else {
-			bounds = getHostFigure().getBounds().getCopy();
-		}
-		getHostFigure().getParent().translateToAbsolute(bounds);
-		getFeedbackLayer().translateToRelative(bounds);
-		return bounds;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createSelectionFeedbackFigure() {
-		if (getHostFigure() instanceof Label) {
-			Label feedbackFigure = new Label();
-			feedbackFigure.setOpaque(true);
-			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-			feedbackFigure.setForegroundColor(ColorConstants.menuForegroundSelected);
-			return feedbackFigure;
-		} else {
-			RectangleFigure feedbackFigure = new RectangleFigure();
-			feedbackFigure.setFill(false);
-			return feedbackFigure;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFocusFeedbackFigure() {
-		return new Figure() {
-
-			@Override
-			protected void paintFigure(Graphics graphics) {
-				graphics.drawFocus(getBounds().getResized(-1, -1));
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void updateLabel(Label target) {
-		Label source = (Label) getHostFigure();
-		target.setText(source.getText());
-		target.setTextAlignment(source.getTextAlignment());
-		target.setFont(source.getFont());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshSelectionFeedback() {
-		if (selectionFeedbackFigure != null) {
-			if (selectionFeedbackFigure instanceof Label) {
-				updateLabel((Label) selectionFeedbackFigure);
-				selectionFeedbackFigure.setBounds(getFeedbackBounds());
-			} else {
-				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFocusFeedback() {
-		if (focusFeedbackFigure != null) {
-			focusFeedbackFigure.setBounds(getFeedbackBounds());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshFeedback() {
-		refreshSelectionFeedback();
-		refreshFocusFeedback();
-	}
-
-	/**
-	 * @generated
-	 */
-	private FigureListener getHostPositionListener() {
-		if (hostPositionListener == null) {
-			hostPositionListener = new FigureListener() {
-				@Override
-				public void figureMoved(IFigure source) {
-					refreshFeedback();
-				}
-			};
-		}
-		return hostPositionListener;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected List<?> createSelectionHandles() {
-		MoveHandle moveHandle = new MoveHandle((GraphicalEditPart) getHost());
-		moveHandle.setBorder(null);
-		moveHandle.setDragTracker(new DragEditPartsTrackerEx(getHost()));
-		return Collections.singletonList(moveHandle);
-	}
-}
+/**

+ * 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.component.edit.policies;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ColorConstants;

+import org.eclipse.draw2d.Figure;

+import org.eclipse.draw2d.FigureListener;

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gef.GraphicalEditPart;

+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;

+

+/**

+ * @generated

+ */

+public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx implements IRefreshableFeedbackEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private IFigure selectionFeedbackFigure;

+

+	/**

+	 * @generated

+	 */

+	private IFigure focusFeedbackFigure;

+

+	/**

+	 * @generated

+	 */

+	private FigureListener hostPositionListener;

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void showPrimarySelection() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setSelected(true);

+			((WrappingLabel) getHostFigure()).setFocus(true);

+		} else {

+			showSelection();

+			showFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void showSelection() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setSelected(true);

+			((WrappingLabel) getHostFigure()).setFocus(false);

+		} else {

+			hideSelection();

+			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());

+			getHostFigure().addFigureListener(getHostPositionListener());

+			refreshSelectionFeedback();

+			hideFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void hideSelection() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setSelected(false);

+			((WrappingLabel) getHostFigure()).setFocus(false);

+		} else {

+			if (selectionFeedbackFigure != null) {

+				removeFeedback(selectionFeedbackFigure);

+				getHostFigure().removeFigureListener(getHostPositionListener());

+				selectionFeedbackFigure = null;

+			}

+			hideFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void showFocus() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setFocus(true);

+		} else {

+			hideFocus();

+			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());

+			refreshFocusFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void hideFocus() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setFocus(false);

+		} else {

+			if (focusFeedbackFigure != null) {

+				removeFeedback(focusFeedbackFigure);

+				focusFeedbackFigure = null;

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Rectangle getFeedbackBounds() {

+		Rectangle bounds;

+		if (getHostFigure() instanceof Label) {

+			bounds = ((Label) getHostFigure()).getTextBounds();

+			bounds.intersect(getHostFigure().getBounds());

+		} else {

+			bounds = getHostFigure().getBounds().getCopy();

+		}

+		getHostFigure().getParent().translateToAbsolute(bounds);

+		getFeedbackLayer().translateToRelative(bounds);

+		return bounds;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createSelectionFeedbackFigure() {

+		if (getHostFigure() instanceof Label) {

+			Label feedbackFigure = new Label();

+			feedbackFigure.setOpaque(true);

+			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);

+			feedbackFigure.setForegroundColor(ColorConstants.menuForegroundSelected);

+			return feedbackFigure;

+		} else {

+			RectangleFigure feedbackFigure = new RectangleFigure();

+			feedbackFigure.setFill(false);

+			return feedbackFigure;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFocusFeedbackFigure() {

+		return new Figure() {

+

+			@Override

+			protected void paintFigure(Graphics graphics) {

+				graphics.drawFocus(getBounds().getResized(-1, -1));

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void updateLabel(Label target) {

+		Label source = (Label) getHostFigure();

+		target.setText(source.getText());

+		target.setTextAlignment(source.getTextAlignment());

+		target.setFont(source.getFont());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSelectionFeedback() {

+		if (selectionFeedbackFigure != null) {

+			if (selectionFeedbackFigure instanceof Label) {

+				updateLabel((Label) selectionFeedbackFigure);

+				selectionFeedbackFigure.setBounds(getFeedbackBounds());

+			} else {

+				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFocusFeedback() {

+		if (focusFeedbackFigure != null) {

+			focusFeedbackFigure.setBounds(getFeedbackBounds());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshFeedback() {

+		refreshSelectionFeedback();

+		refreshFocusFeedback();

+	}

+

+	/**

+	 * @generated

+	 */

+	private FigureListener getHostPositionListener() {

+		if (hostPositionListener == null) {

+			hostPositionListener = new FigureListener() {

+				@Override

+				public void figureMoved(IFigure source) {

+					refreshFeedback();

+				}

+			};

+		}

+		return hostPositionListener;

+	}

+

+	/**

+	 * @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.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLTextSelectionEditPolicy.java
index 866d81fa9fe..a665cae3bde 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLTextSelectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLTextSelectionEditPolicy.java
@@ -1,226 +1,226 @@
-/**
- * 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.component.edit.policies;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-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;
-
-/**
- * @generated
- */
-public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements IRefreshableFeedbackEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	private IFigure selectionFeedbackFigure;
-
-	/**
-	 * @generated
-	 */
-	private IFigure focusFeedbackFigure;
-
-	/**
-	 * @generated
-	 */
-	private FigureListener hostPositionListener;
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void showPrimarySelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(true);
-			((WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			showSelection();
-			showFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void showSelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(true);
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			hideSelection();
-			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
-			getHostFigure().addFigureListener(getHostPositionListener());
-			refreshSelectionFeedback();
-			hideFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void hideSelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(false);
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (selectionFeedbackFigure != null) {
-				removeFeedback(selectionFeedbackFigure);
-				getHostFigure().removeFigureListener(getHostPositionListener());
-				selectionFeedbackFigure = null;
-			}
-			hideFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void showFocus() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			hideFocus();
-			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
-			refreshFocusFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void hideFocus() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (focusFeedbackFigure != null) {
-				removeFeedback(focusFeedbackFigure);
-				focusFeedbackFigure = null;
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Rectangle getFeedbackBounds() {
-		Rectangle bounds;
-		if (getHostFigure() instanceof Label) {
-			bounds = ((Label) getHostFigure()).getTextBounds();
-			bounds.intersect(getHostFigure().getBounds());
-		} else {
-			bounds = getHostFigure().getBounds().getCopy();
-		}
-		getHostFigure().getParent().translateToAbsolute(bounds);
-		getFeedbackLayer().translateToRelative(bounds);
-		return bounds;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createSelectionFeedbackFigure() {
-		if (getHostFigure() instanceof Label) {
-			Label feedbackFigure = new Label();
-			feedbackFigure.setOpaque(true);
-			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-			feedbackFigure.setForegroundColor(ColorConstants.menuForegroundSelected);
-			return feedbackFigure;
-		} else {
-			RectangleFigure feedbackFigure = new RectangleFigure();
-			feedbackFigure.setFill(false);
-			return feedbackFigure;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFocusFeedbackFigure() {
-		return new Figure() {
-
-			@Override
-			protected void paintFigure(Graphics graphics) {
-				graphics.drawFocus(getBounds().getResized(-1, -1));
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void updateLabel(Label target) {
-		Label source = (Label) getHostFigure();
-		target.setText(source.getText());
-		target.setTextAlignment(source.getTextAlignment());
-		target.setFont(source.getFont());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshSelectionFeedback() {
-		if (selectionFeedbackFigure != null) {
-			if (selectionFeedbackFigure instanceof Label) {
-				updateLabel((Label) selectionFeedbackFigure);
-				selectionFeedbackFigure.setBounds(getFeedbackBounds());
-			} else {
-				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFocusFeedback() {
-		if (focusFeedbackFigure != null) {
-			focusFeedbackFigure.setBounds(getFeedbackBounds());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void refreshFeedback() {
-		refreshSelectionFeedback();
-		refreshFocusFeedback();
-	}
-
-	/**
-	 * @generated
-	 */
-	private FigureListener getHostPositionListener() {
-		if (hostPositionListener == null) {
-			hostPositionListener = new FigureListener() {
-				@Override
-				public void figureMoved(IFigure source) {
-					refreshFeedback();
-				}
-			};
-		}
-		return hostPositionListener;
-	}
-}
+/**

+ * 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.component.edit.policies;

+

+import org.eclipse.draw2d.ColorConstants;

+import org.eclipse.draw2d.Figure;

+import org.eclipse.draw2d.FigureListener;

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+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;

+

+/**

+ * @generated

+ */

+public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements IRefreshableFeedbackEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private IFigure selectionFeedbackFigure;

+

+	/**

+	 * @generated

+	 */

+	private IFigure focusFeedbackFigure;

+

+	/**

+	 * @generated

+	 */

+	private FigureListener hostPositionListener;

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void showPrimarySelection() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setSelected(true);

+			((WrappingLabel) getHostFigure()).setFocus(true);

+		} else {

+			showSelection();

+			showFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void showSelection() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setSelected(true);

+			((WrappingLabel) getHostFigure()).setFocus(false);

+		} else {

+			hideSelection();

+			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());

+			getHostFigure().addFigureListener(getHostPositionListener());

+			refreshSelectionFeedback();

+			hideFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void hideSelection() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setSelected(false);

+			((WrappingLabel) getHostFigure()).setFocus(false);

+		} else {

+			if (selectionFeedbackFigure != null) {

+				removeFeedback(selectionFeedbackFigure);

+				getHostFigure().removeFigureListener(getHostPositionListener());

+				selectionFeedbackFigure = null;

+			}

+			hideFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void showFocus() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setFocus(true);

+		} else {

+			hideFocus();

+			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());

+			refreshFocusFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void hideFocus() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setFocus(false);

+		} else {

+			if (focusFeedbackFigure != null) {

+				removeFeedback(focusFeedbackFigure);

+				focusFeedbackFigure = null;

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Rectangle getFeedbackBounds() {

+		Rectangle bounds;

+		if (getHostFigure() instanceof Label) {

+			bounds = ((Label) getHostFigure()).getTextBounds();

+			bounds.intersect(getHostFigure().getBounds());

+		} else {

+			bounds = getHostFigure().getBounds().getCopy();

+		}

+		getHostFigure().getParent().translateToAbsolute(bounds);

+		getFeedbackLayer().translateToRelative(bounds);

+		return bounds;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createSelectionFeedbackFigure() {

+		if (getHostFigure() instanceof Label) {

+			Label feedbackFigure = new Label();

+			feedbackFigure.setOpaque(true);

+			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);

+			feedbackFigure.setForegroundColor(ColorConstants.menuForegroundSelected);

+			return feedbackFigure;

+		} else {

+			RectangleFigure feedbackFigure = new RectangleFigure();

+			feedbackFigure.setFill(false);

+			return feedbackFigure;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFocusFeedbackFigure() {

+		return new Figure() {

+

+			@Override

+			protected void paintFigure(Graphics graphics) {

+				graphics.drawFocus(getBounds().getResized(-1, -1));

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void updateLabel(Label target) {

+		Label source = (Label) getHostFigure();

+		target.setText(source.getText());

+		target.setTextAlignment(source.getTextAlignment());

+		target.setFont(source.getFont());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSelectionFeedback() {

+		if (selectionFeedbackFigure != null) {

+			if (selectionFeedbackFigure instanceof Label) {

+				updateLabel((Label) selectionFeedbackFigure);

+				selectionFeedbackFigure.setBounds(getFeedbackBounds());

+			} else {

+				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFocusFeedback() {

+		if (focusFeedbackFigure != null) {

+			focusFeedbackFigure.setBounds(getFeedbackBounds());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshFeedback() {

+		refreshSelectionFeedback();

+		refreshFocusFeedback();

+	}

+

+	/**

+	 * @generated

+	 */

+	private FigureListener getHostPositionListener() {

+		if (hostPositionListener == null) {

+			hostPositionListener = new FigureListener() {

+				@Override

+				public void figureMoved(IFigure source) {

+					refreshFeedback();

+				}

+			};

+		}

+		return hostPositionListener;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/expressions/UMLAbstractExpression.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/expressions/UMLAbstractExpression.java
index 9c9c8977c49..2f37cc2beac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/expressions/UMLAbstractExpression.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/expressions/UMLAbstractExpression.java
@@ -1,171 +1,171 @@
-/**
- * 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.component.expressions;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Collections;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public abstract class UMLAbstractExpression {
-
-	/**
-	 * @generated
-	 */
-	private IStatus status = Status.OK_STATUS;
-
-	/**
-	 * @generated
-	 */
-	protected void setStatus(int severity, String message, Throwable throwable) {
-		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(), //$NON-NLS-1$//$NON-NLS-2$
-					throwable);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public IStatus getStatus() {
-		return status;
-	}
-
-	/**
-	 * @generated
-	 */
-	private final String myBody;
-
-	/**
-	 * @generated
-	 */
-	public String body() {
-		return myBody;
-	}
-
-	/**
-	 * @generated
-	 */
-	private final EClassifier myContext;
-
-	/**
-	 * @generated
-	 */
-	public EClassifier context() {
-		return myContext;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected UMLAbstractExpression(String body, EClassifier context) {
-		myBody = body;
-		myContext = context;
-	}
-
-	/**
-	 * @generated
-	 */
-	@SuppressWarnings("rawtypes")
-	protected abstract Object doEvaluate(Object context, Map env);
-
-	/**
-	 * @generated
-	 */
-	public Object evaluate(Object context) {
-		return evaluate(context, Collections.EMPTY_MAP);
-	}
-
-	/**
-	 * @generated
-	 */
-	@SuppressWarnings("rawtypes")
-	public Object evaluate(Object context, Map env) {
-		if (context().isInstance(context)) {
-			try {
-				return doEvaluate(context, env);
-			} catch (Exception e) {
-				UMLDiagramEditorPlugin.getInstance().logError("Expression evaluation failure: " + body(), e); //$NON-NLS-1$
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Expression may return number value which is not directly compatible with feature type (e.g. Double when Integer is expected), or EEnumLiteral
-	 * meta-object when literal instance is expected
-	 *
-	 * @generated
-	 */
-	public static Object performCast(Object value, EDataType targetType) {
-		if (targetType instanceof EEnum) {
-			if (value instanceof EEnumLiteral) {
-				EEnumLiteral literal = (EEnumLiteral) value;
-				return (literal.getInstance() != null) ? literal.getInstance() : literal;
-			}
-		}
-		if (false == value instanceof Number || targetType == null || targetType.getInstanceClass() == null) {
-			return value;
-		}
-		Class<?> targetClass = targetType.getInstanceClass();
-		Number num = (Number) value;
-		Class<?> valClass = value.getClass();
-		Class<?> targetWrapperClass = targetClass;
-		if (targetClass.isPrimitive()) {
-			targetWrapperClass = EcoreUtil.wrapperClassFor(targetClass);
-		}
-		if (valClass.equals(targetWrapperClass)) {
-			return value;
-		}
-		if (Number.class.isAssignableFrom(targetWrapperClass)) {
-			if (targetWrapperClass.equals(Byte.class)) {
-				return new Byte(num.byteValue());
-			}
-			if (targetWrapperClass.equals(Integer.class)) {
-				return new Integer(num.intValue());
-			}
-			if (targetWrapperClass.equals(Short.class)) {
-				return new Short(num.shortValue());
-			}
-			if (targetWrapperClass.equals(Long.class)) {
-				return new Long(num.longValue());
-			}
-			if (targetWrapperClass.equals(BigInteger.class)) {
-				return BigInteger.valueOf(num.longValue());
-			}
-			if (targetWrapperClass.equals(Float.class)) {
-				return new Float(num.floatValue());
-			}
-			if (targetWrapperClass.equals(Double.class)) {
-				return new Double(num.doubleValue());
-			}
-			if (targetWrapperClass.equals(BigDecimal.class)) {
-				return new BigDecimal(num.doubleValue());
-			}
-		}
-		return value;
-	}
-}
+/**

+ * 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.component.expressions;

+

+import java.math.BigDecimal;

+import java.math.BigInteger;

+import java.util.Collections;

+import java.util.Map;

+

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.emf.ecore.EClassifier;

+import org.eclipse.emf.ecore.EDataType;

+import org.eclipse.emf.ecore.EEnum;

+import org.eclipse.emf.ecore.EEnumLiteral;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public abstract class UMLAbstractExpression {

+

+	/**

+	 * @generated

+	 */

+	private IStatus status = Status.OK_STATUS;

+

+	/**

+	 * @generated

+	 */

+	protected void setStatus(int severity, String message, Throwable throwable) {

+		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(), //$NON-NLS-1$//$NON-NLS-2$

+					throwable);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public IStatus getStatus() {

+		return status;

+	}

+

+	/**

+	 * @generated

+	 */

+	private final String myBody;

+

+	/**

+	 * @generated

+	 */

+	public String body() {

+		return myBody;

+	}

+

+	/**

+	 * @generated

+	 */

+	private final EClassifier myContext;

+

+	/**

+	 * @generated

+	 */

+	public EClassifier context() {

+		return myContext;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected UMLAbstractExpression(String body, EClassifier context) {

+		myBody = body;

+		myContext = context;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected abstract Object doEvaluate(Object context, Map env);

+

+	/**

+	 * @generated

+	 */

+	public Object evaluate(Object context) {

+		return evaluate(context, Collections.EMPTY_MAP);

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	public Object evaluate(Object context, Map env) {

+		if (context().isInstance(context)) {

+			try {

+				return doEvaluate(context, env);

+			} catch (Exception e) {

+				UMLDiagramEditorPlugin.getInstance().logError("Expression evaluation failure: " + body(), e); //$NON-NLS-1$

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Expression may return number value which is not directly compatible with feature type (e.g. Double when Integer is expected), or EEnumLiteral

+	 * meta-object when literal instance is expected

+	 *

+	 * @generated

+	 */

+	public static Object performCast(Object value, EDataType targetType) {

+		if (targetType instanceof EEnum) {

+			if (value instanceof EEnumLiteral) {

+				EEnumLiteral literal = (EEnumLiteral) value;

+				return (literal.getInstance() != null) ? literal.getInstance() : literal;

+			}

+		}

+		if (false == value instanceof Number || targetType == null || targetType.getInstanceClass() == null) {

+			return value;

+		}

+		Class<?> targetClass = targetType.getInstanceClass();

+		Number num = (Number) value;

+		Class<?> valClass = value.getClass();

+		Class<?> targetWrapperClass = targetClass;

+		if (targetClass.isPrimitive()) {

+			targetWrapperClass = EcoreUtil.wrapperClassFor(targetClass);

+		}

+		if (valClass.equals(targetWrapperClass)) {

+			return value;

+		}

+		if (Number.class.isAssignableFrom(targetWrapperClass)) {

+			if (targetWrapperClass.equals(Byte.class)) {

+				return new Byte(num.byteValue());

+			}

+			if (targetWrapperClass.equals(Integer.class)) {

+				return new Integer(num.intValue());

+			}

+			if (targetWrapperClass.equals(Short.class)) {

+				return new Short(num.shortValue());

+			}

+			if (targetWrapperClass.equals(Long.class)) {

+				return new Long(num.longValue());

+			}

+			if (targetWrapperClass.equals(BigInteger.class)) {

+				return BigInteger.valueOf(num.longValue());

+			}

+			if (targetWrapperClass.equals(Float.class)) {

+				return new Float(num.floatValue());

+			}

+			if (targetWrapperClass.equals(Double.class)) {

+				return new Double(num.doubleValue());

+			}

+			if (targetWrapperClass.equals(BigDecimal.class)) {

+				return new BigDecimal(num.doubleValue());

+			}

+		}

+		return value;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/expressions/UMLOCLFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/expressions/UMLOCLFactory.java
index 8e0ddb69dd5..6dea83bdbc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/expressions/UMLOCLFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/expressions/UMLOCLFactory.java
@@ -1,198 +1,198 @@
-/**
- * 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.component.expressions;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EParameter;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.ocl.Environment;
-import org.eclipse.ocl.EvaluationEnvironment;
-import org.eclipse.ocl.ParserException;
-import org.eclipse.ocl.ecore.EcoreFactory;
-import org.eclipse.ocl.ecore.OCL.Helper;
-import org.eclipse.ocl.ecore.OCLExpression;
-import org.eclipse.ocl.ecore.Variable;
-import org.eclipse.ocl.options.ParsingOptions;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class UMLOCLFactory {
-
-	/**
-	 * @generated
-	 */
-	private final UMLAbstractExpression[] expressions;
-
-	/**
-	 * @generated
-	 */
-	private final String[] expressionBodies;
-
-	/**
-	 * @generated
-	 */
-	protected UMLOCLFactory() {
-		this.expressions = new UMLAbstractExpression[9];
-		this.expressionBodies = new String[] {
-				"let base : String = \'Component\' in\r\nlet suffixes : Sequence(String) = Sequence {\'0\', \'1\', \'2\', \'3\', \'4\', \'5\', \'6\', \'7\', \'8\', \'9\', \'10\'} in \r\nlet space : Namespace = self.namespace in\r\nlet allMissed : Sequence(String) = suffixes->\r\n    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))\r\n    ) in\r\nlet firstMissed : String = allMissed->first() in \r\nlet noMisses : Boolean = firstMissed.oclIsUndefined() in\r\nlet allNames : Set(String) = \r\n    if noMisses \r\n    then \r\n    space.member->collect(e : NamedElement | \r\n         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) <> base\r\n         then \'\' \r\n         else e.name \r\n         endif)->asSet()->excluding(\'\') else Set{\'not in use\'} \r\n    endif in \r\nlet longestName : String = \r\n    if noMisses\r\n    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() \r\n    else \'not in use\' \r\n    endif in \r\nif noMisses then \r\n    if longestName.oclIsUndefined() \r\n    then base \r\n    else longestName.concat(\'1\') \r\n    endif \r\nelse \r\n    base.concat(firstMissed) \r\nendif ", //$NON-NLS-1$
-				"let base : String = \'Port\' in\r\nlet suffixes : Sequence(String) = Sequence {\'0\', \'1\', \'2\', \'3\', \'4\', \'5\', \'6\', \'7\', \'8\', \'9\', \'10\'} in \r\nlet space : Namespace = self.namespace in\r\nlet allMissed : Sequence(String) = suffixes->\r\n    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))\r\n    ) in\r\nlet firstMissed : String = allMissed->first() in \r\nlet noMisses : Boolean = firstMissed.oclIsUndefined() in\r\nlet allNames : Set(String) = \r\n    if noMisses \r\n    then \r\n    space.member->collect(e : NamedElement | \r\n         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) <> base\r\n         then \'\' \r\n         else e.name \r\n         endif)->asSet()->excluding(\'\') else Set{\'not in use\'} \r\n    endif in \r\nlet longestName : String = \r\n    if noMisses\r\n    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() \r\n    else \'not in use\' \r\n    endif in \r\nif noMisses then \r\n    if longestName.oclIsUndefined() \r\n    then base \r\n    else longestName.concat(\'1\') \r\n    endif \r\nelse \r\n    base.concat(firstMissed) \r\nendif ", //$NON-NLS-1$
-				"let base : String = \'Interface\' in\r\nlet suffixes : Sequence(String) = Sequence {\'0\', \'1\', \'2\', \'3\', \'4\', \'5\', \'6\', \'7\', \'8\', \'9\', \'10\'} in \r\nlet space : Namespace = self.namespace in\r\nlet allMissed : Sequence(String) = suffixes->\r\n    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))\r\n    ) in\r\nlet firstMissed : String = allMissed->first() in \r\nlet noMisses : Boolean = firstMissed.oclIsUndefined() in\r\nlet allNames : Set(String) = \r\n    if noMisses \r\n    then \r\n    space.member->collect(e : NamedElement | \r\n         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) <> base\r\n         then \'\' \r\n         else e.name \r\n         endif)->asSet()->excluding(\'\') else Set{\'not in use\'} \r\n    endif in \r\nlet longestName : String = \r\n    if noMisses\r\n    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() \r\n    else \'not in use\' \r\n    endif in \r\nif noMisses then \r\n    if longestName.oclIsUndefined() \r\n    then base \r\n    else longestName.concat(\'1\') \r\n    endif \r\nelse \r\n    base.concat(firstMissed) \r\nendif ", //$NON-NLS-1$
-				"let base : String = \'Usage\' in\r\nlet suffixes : Sequence(String) = Sequence {\'0\', \'1\', \'2\', \'3\', \'4\', \'5\', \'6\', \'7\', \'8\', \'9\', \'10\'} in \r\nlet space : Namespace = self.namespace in\r\nlet allMissed : Sequence(String) = suffixes->\r\n    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))\r\n    ) in\r\nlet firstMissed : String = allMissed->first() in \r\nlet noMisses : Boolean = firstMissed.oclIsUndefined() in\r\nlet allNames : Set(String) = \r\n    if noMisses \r\n    then \r\n    space.member->collect(e : NamedElement | \r\n         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) <> base\r\n         then \'\' \r\n         else e.name \r\n         endif)->asSet()->excluding(\'\') else Set{\'not in use\'} \r\n    endif in \r\nlet longestName : String = \r\n    if noMisses\r\n    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() \r\n    else \'not in use\' \r\n    endif in \r\nif noMisses then \r\n    if longestName.oclIsUndefined() \r\n    then base \r\n    else longestName.concat(\'1\') \r\n    endif \r\nelse \r\n    base.concat(firstMissed) \r\nendif ", //$NON-NLS-1$
-				"let base : String = \'Realization\' in\r\nlet suffixes : Sequence(String) = Sequence {\'0\', \'1\', \'2\', \'3\', \'4\', \'5\', \'6\', \'7\', \'8\', \'9\', \'10\'} in \r\nlet space : Namespace = self.namespace in\r\nlet allMissed : Sequence(String) = suffixes->\r\n    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))\r\n    ) in\r\nlet firstMissed : String = allMissed->first() in \r\nlet noMisses : Boolean = firstMissed.oclIsUndefined() in\r\nlet allNames : Set(String) = \r\n    if noMisses \r\n    then \r\n    space.member->collect(e : NamedElement | \r\n         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) <> base\r\n         then \'\' \r\n         else e.name \r\n         endif)->asSet()->excluding(\'\') else Set{\'not in use\'} \r\n    endif in \r\nlet longestName : String = \r\n    if noMisses\r\n    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() \r\n    else \'not in use\' \r\n    endif in \r\nif noMisses then \r\n    if longestName.oclIsUndefined() \r\n    then base \r\n    else longestName.concat(\'1\') \r\n    endif \r\nelse \r\n    base.concat(firstMissed) \r\nendif ", //$NON-NLS-1$
-				"let base : String = \'Package\' in\r\nlet suffixes : Sequence(String) = Sequence {\'\', \'1\', \'2\', \'3\', \'4\', \'5\', \'6\', \'7\', \'8\', \'9\', \'10\'} in \r\nlet space : Namespace = self.namespace in\r\nlet allMissed : Sequence(String) = suffixes->\r\n    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))\r\n    ) in\r\nlet firstMissed : String = allMissed->first() in \r\nlet noMisses : Boolean = firstMissed.oclIsUndefined() in\r\nlet allNames : Set(String) = \r\n    if noMisses \r\n    then \r\n    space.member->collect(e : NamedElement | \r\n         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) <> base\r\n         then \'\' \r\n         else e.name \r\n         endif)->asSet()->excluding(\'\') else Set{\'not in use\'} \r\n    endif in \r\nlet longestName : String = \r\n    if noMisses\r\n    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() \r\n    else \'not in use\' \r\n    endif in \r\nif noMisses then \r\n    if longestName.oclIsUndefined() \r\n    then base \r\n    else longestName.concat(\'1\') \r\n    endif \r\nelse \r\n    base.concat(firstMissed) \r\nendif ", //$NON-NLS-1$
-				"self.oclIsKindOf(uml::Interface)", //$NON-NLS-1$
-				"self.oclIsKindOf(uml::Component) or self.oclIsKindOf(uml::Port)", //$NON-NLS-1$
-				"self.name.concat(\'.file\') ", //$NON-NLS-1$
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	private static UMLOCLFactory getInstance() {
-		UMLOCLFactory instance = UMLDiagramEditorPlugin.getInstance().getUMLOCLFactory();
-		if (instance == null) {
-			UMLDiagramEditorPlugin.getInstance().setUMLOCLFactory(instance = new UMLOCLFactory());
-		}
-		return instance;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static String getExpressionBody(int index) {
-		return getInstance().expressionBodies[index];
-	}
-
-	/**
-	 * @generated
-	 */
-	public static UMLAbstractExpression getExpression(int index, EClassifier context,
-			Map<String, EClassifier> environment) {
-		UMLOCLFactory cached = getInstance();
-		if (index < 0 || index >= cached.expressions.length) {
-			throw new IllegalArgumentException();
-		}
-		if (cached.expressions[index] == null) {
-			cached.expressions[index] = getExpression(cached.expressionBodies[index], context,
-					environment == null ? Collections.<String, EClassifier> emptyMap() : environment);
-		}
-		return cached.expressions[index];
-	}
-
-	/**
-	 * This is factory method, callers are responsible to keep reference to the return value if they want to reuse parsed expression
-	 *
-	 * @generated
-	 */
-	public static UMLAbstractExpression getExpression(String body, EClassifier context,
-			Map<String, EClassifier> environment) {
-		return new Expression(body, context, environment);
-	}
-
-	/**
-	 * This method will become private in the next release
-	 *
-	 * @generated
-	 */
-	public static UMLAbstractExpression getExpression(String body, EClassifier context) {
-		return getExpression(body, context, Collections.<String, EClassifier> emptyMap());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class Expression extends UMLAbstractExpression {
-
-		/**
-		 * @generated
-		 */
-		private final org.eclipse.ocl.ecore.OCL oclInstance;
-
-		/**
-		 * @generated
-		 */
-		private OCLExpression oclExpression;
-
-		/**
-		 * @generated
-		 */
-		public Expression(String body, EClassifier context, Map<String, EClassifier> environment) {
-			super(body, context);
-			oclInstance = org.eclipse.ocl.ecore.OCL.newInstance();
-			initCustomEnv(oclInstance.getEnvironment(), environment);
-			Helper oclHelper = oclInstance.createOCLHelper();
-			oclHelper.setContext(context());
-			try {
-				oclExpression = oclHelper.createQuery(body());
-				setStatus(IStatus.OK, null, null);
-			} catch (ParserException e) {
-				setStatus(IStatus.ERROR, e.getMessage(), e);
-			}
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		@SuppressWarnings("rawtypes")
-		protected Object doEvaluate(Object context, Map env) {
-			if (oclExpression == null) {
-				return null;
-			}
-			// on the first call, both evalEnvironment and extentMap are clear, for later we have finally, below.
-			EvaluationEnvironment<?, ?, ?, ?, ?> evalEnv = oclInstance.getEvaluationEnvironment();
-			// initialize environment
-			for (Object nextKey : env.keySet()) {
-				evalEnv.replace((String) nextKey, env.get(nextKey));
-			}
-			try {
-				Object result = oclInstance.evaluate(context, oclExpression);
-				return oclInstance.isInvalid(result) ? null : result;
-			} finally {
-				evalEnv.clear();
-				oclInstance.setExtentMap(null); // clear allInstances cache, and get the oclInstance ready for the next call
-			}
-		}
-
-		/**
-		 * @generated
-		 */
-		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());
-			for (String varName : environment.keySet()) {
-				EClassifier varType = environment.get(varName);
-				ecoreEnv.addElement(varName, createVar(ecoreEnv, varName, varType), false);
-			}
-		}
-
-		/**
-		 * @generated
-		 */
-		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));
-			return var;
-		}
-	}
-}
+/**

+ * 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.component.expressions;

+

+import java.util.Collections;

+import java.util.Map;

+

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.emf.ecore.EClassifier;

+import org.eclipse.emf.ecore.EParameter;

+import org.eclipse.emf.ecore.EcorePackage;

+import org.eclipse.ocl.Environment;

+import org.eclipse.ocl.EvaluationEnvironment;

+import org.eclipse.ocl.ParserException;

+import org.eclipse.ocl.ecore.EcoreFactory;

+import org.eclipse.ocl.ecore.OCL.Helper;

+import org.eclipse.ocl.ecore.OCLExpression;

+import org.eclipse.ocl.ecore.Variable;

+import org.eclipse.ocl.options.ParsingOptions;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class UMLOCLFactory {

+

+	/**

+	 * @generated

+	 */

+	private final UMLAbstractExpression[] expressions;

+

+	/**

+	 * @generated

+	 */

+	private final String[] expressionBodies;

+

+	/**

+	 * @generated

+	 */

+	protected UMLOCLFactory() {

+		this.expressions = new UMLAbstractExpression[9];

+		this.expressionBodies = new String[] {

+				"let base : String = \'Component\' in\r\nlet suffixes : Sequence(String) = Sequence {\'0\', \'1\', \'2\', \'3\', \'4\', \'5\', \'6\', \'7\', \'8\', \'9\', \'10\'} in \r\nlet space : Namespace = self.namespace in\r\nlet allMissed : Sequence(String) = suffixes->\r\n    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))\r\n    ) in\r\nlet firstMissed : String = allMissed->first() in \r\nlet noMisses : Boolean = firstMissed.oclIsUndefined() in\r\nlet allNames : Set(String) = \r\n    if noMisses \r\n    then \r\n    space.member->collect(e : NamedElement | \r\n         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) <> base\r\n         then \'\' \r\n         else e.name \r\n         endif)->asSet()->excluding(\'\') else Set{\'not in use\'} \r\n    endif in \r\nlet longestName : String = \r\n    if noMisses\r\n    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() \r\n    else \'not in use\' \r\n    endif in \r\nif noMisses then \r\n    if longestName.oclIsUndefined() \r\n    then base \r\n    else longestName.concat(\'1\') \r\n    endif \r\nelse \r\n    base.concat(firstMissed) \r\nendif ", //$NON-NLS-1$

+				"let base : String = \'Port\' in\r\nlet suffixes : Sequence(String) = Sequence {\'0\', \'1\', \'2\', \'3\', \'4\', \'5\', \'6\', \'7\', \'8\', \'9\', \'10\'} in \r\nlet space : Namespace = self.namespace in\r\nlet allMissed : Sequence(String) = suffixes->\r\n    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))\r\n    ) in\r\nlet firstMissed : String = allMissed->first() in \r\nlet noMisses : Boolean = firstMissed.oclIsUndefined() in\r\nlet allNames : Set(String) = \r\n    if noMisses \r\n    then \r\n    space.member->collect(e : NamedElement | \r\n         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) <> base\r\n         then \'\' \r\n         else e.name \r\n         endif)->asSet()->excluding(\'\') else Set{\'not in use\'} \r\n    endif in \r\nlet longestName : String = \r\n    if noMisses\r\n    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() \r\n    else \'not in use\' \r\n    endif in \r\nif noMisses then \r\n    if longestName.oclIsUndefined() \r\n    then base \r\n    else longestName.concat(\'1\') \r\n    endif \r\nelse \r\n    base.concat(firstMissed) \r\nendif ", //$NON-NLS-1$

+				"let base : String = \'Interface\' in\r\nlet suffixes : Sequence(String) = Sequence {\'0\', \'1\', \'2\', \'3\', \'4\', \'5\', \'6\', \'7\', \'8\', \'9\', \'10\'} in \r\nlet space : Namespace = self.namespace in\r\nlet allMissed : Sequence(String) = suffixes->\r\n    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))\r\n    ) in\r\nlet firstMissed : String = allMissed->first() in \r\nlet noMisses : Boolean = firstMissed.oclIsUndefined() in\r\nlet allNames : Set(String) = \r\n    if noMisses \r\n    then \r\n    space.member->collect(e : NamedElement | \r\n         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) <> base\r\n         then \'\' \r\n         else e.name \r\n         endif)->asSet()->excluding(\'\') else Set{\'not in use\'} \r\n    endif in \r\nlet longestName : String = \r\n    if noMisses\r\n    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() \r\n    else \'not in use\' \r\n    endif in \r\nif noMisses then \r\n    if longestName.oclIsUndefined() \r\n    then base \r\n    else longestName.concat(\'1\') \r\n    endif \r\nelse \r\n    base.concat(firstMissed) \r\nendif ", //$NON-NLS-1$

+				"let base : String = \'Usage\' in\r\nlet suffixes : Sequence(String) = Sequence {\'0\', \'1\', \'2\', \'3\', \'4\', \'5\', \'6\', \'7\', \'8\', \'9\', \'10\'} in \r\nlet space : Namespace = self.namespace in\r\nlet allMissed : Sequence(String) = suffixes->\r\n    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))\r\n    ) in\r\nlet firstMissed : String = allMissed->first() in \r\nlet noMisses : Boolean = firstMissed.oclIsUndefined() in\r\nlet allNames : Set(String) = \r\n    if noMisses \r\n    then \r\n    space.member->collect(e : NamedElement | \r\n         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) <> base\r\n         then \'\' \r\n         else e.name \r\n         endif)->asSet()->excluding(\'\') else Set{\'not in use\'} \r\n    endif in \r\nlet longestName : String = \r\n    if noMisses\r\n    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() \r\n    else \'not in use\' \r\n    endif in \r\nif noMisses then \r\n    if longestName.oclIsUndefined() \r\n    then base \r\n    else longestName.concat(\'1\') \r\n    endif \r\nelse \r\n    base.concat(firstMissed) \r\nendif ", //$NON-NLS-1$

+				"let base : String = \'Realization\' in\r\nlet suffixes : Sequence(String) = Sequence {\'0\', \'1\', \'2\', \'3\', \'4\', \'5\', \'6\', \'7\', \'8\', \'9\', \'10\'} in \r\nlet space : Namespace = self.namespace in\r\nlet allMissed : Sequence(String) = suffixes->\r\n    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))\r\n    ) in\r\nlet firstMissed : String = allMissed->first() in \r\nlet noMisses : Boolean = firstMissed.oclIsUndefined() in\r\nlet allNames : Set(String) = \r\n    if noMisses \r\n    then \r\n    space.member->collect(e : NamedElement | \r\n         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) <> base\r\n         then \'\' \r\n         else e.name \r\n         endif)->asSet()->excluding(\'\') else Set{\'not in use\'} \r\n    endif in \r\nlet longestName : String = \r\n    if noMisses\r\n    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() \r\n    else \'not in use\' \r\n    endif in \r\nif noMisses then \r\n    if longestName.oclIsUndefined() \r\n    then base \r\n    else longestName.concat(\'1\') \r\n    endif \r\nelse \r\n    base.concat(firstMissed) \r\nendif ", //$NON-NLS-1$

+				"let base : String = \'Package\' in\r\nlet suffixes : Sequence(String) = Sequence {\'\', \'1\', \'2\', \'3\', \'4\', \'5\', \'6\', \'7\', \'8\', \'9\', \'10\'} in \r\nlet space : Namespace = self.namespace in\r\nlet allMissed : Sequence(String) = suffixes->\r\n    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))\r\n    ) in\r\nlet firstMissed : String = allMissed->first() in \r\nlet noMisses : Boolean = firstMissed.oclIsUndefined() in\r\nlet allNames : Set(String) = \r\n    if noMisses \r\n    then \r\n    space.member->collect(e : NamedElement | \r\n         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) <> base\r\n         then \'\' \r\n         else e.name \r\n         endif)->asSet()->excluding(\'\') else Set{\'not in use\'} \r\n    endif in \r\nlet longestName : String = \r\n    if noMisses\r\n    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() \r\n    else \'not in use\' \r\n    endif in \r\nif noMisses then \r\n    if longestName.oclIsUndefined() \r\n    then base \r\n    else longestName.concat(\'1\') \r\n    endif \r\nelse \r\n    base.concat(firstMissed) \r\nendif ", //$NON-NLS-1$

+				"self.oclIsKindOf(uml::Interface)", //$NON-NLS-1$

+				"self.oclIsKindOf(uml::Component) or self.oclIsKindOf(uml::Port)", //$NON-NLS-1$

+				"self.name.concat(\'.file\') ", //$NON-NLS-1$

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	private static UMLOCLFactory getInstance() {

+		UMLOCLFactory instance = UMLDiagramEditorPlugin.getInstance().getUMLOCLFactory();

+		if (instance == null) {

+			UMLDiagramEditorPlugin.getInstance().setUMLOCLFactory(instance = new UMLOCLFactory());

+		}

+		return instance;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static String getExpressionBody(int index) {

+		return getInstance().expressionBodies[index];

+	}

+

+	/**

+	 * @generated

+	 */

+	public static UMLAbstractExpression getExpression(int index, EClassifier context,

+			Map<String, EClassifier> environment) {

+		UMLOCLFactory cached = getInstance();

+		if (index < 0 || index >= cached.expressions.length) {

+			throw new IllegalArgumentException();

+		}

+		if (cached.expressions[index] == null) {

+			cached.expressions[index] = getExpression(cached.expressionBodies[index], context,

+					environment == null ? Collections.<String, EClassifier>emptyMap() : environment);

+		}

+		return cached.expressions[index];

+	}

+

+	/**

+	 * This is factory method, callers are responsible to keep reference to the return value if they want to reuse parsed expression

+	 *

+	 * @generated

+	 */

+	public static UMLAbstractExpression getExpression(String body, EClassifier context,

+			Map<String, EClassifier> environment) {

+		return new Expression(body, context, environment);

+	}

+

+	/**

+	 * This method will become private in the next release

+	 *

+	 * @generated

+	 */

+	public static UMLAbstractExpression getExpression(String body, EClassifier context) {

+		return getExpression(body, context, Collections.<String, EClassifier>emptyMap());

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class Expression extends UMLAbstractExpression {

+

+		/**

+		 * @generated

+		 */

+		private final org.eclipse.ocl.ecore.OCL oclInstance;

+

+		/**

+		 * @generated

+		 */

+		private OCLExpression oclExpression;

+

+		/**

+		 * @generated

+		 */

+		public Expression(String body, EClassifier context, Map<String, EClassifier> environment) {

+			super(body, context);

+			oclInstance = org.eclipse.ocl.ecore.OCL.newInstance();

+			initCustomEnv(oclInstance.getEnvironment(), environment);

+			Helper oclHelper = oclInstance.createOCLHelper();

+			oclHelper.setContext(context());

+			try {

+				oclExpression = oclHelper.createQuery(body());

+				setStatus(IStatus.OK, null, null);

+			} catch (ParserException e) {

+				setStatus(IStatus.ERROR, e.getMessage(), e);

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		@SuppressWarnings("rawtypes")

+		protected Object doEvaluate(Object context, Map env) {

+			if (oclExpression == null) {

+				return null;

+			}

+			// on the first call, both evalEnvironment and extentMap are clear, for later we have finally, below.

+			EvaluationEnvironment<?, ?, ?, ?, ?> evalEnv = oclInstance.getEvaluationEnvironment();

+			// initialize environment

+			for (Object nextKey : env.keySet()) {

+				evalEnv.replace((String) nextKey, env.get(nextKey));

+			}

+			try {

+				Object result = oclInstance.evaluate(context, oclExpression);

+				return oclInstance.isInvalid(result) ? null : result;

+			} finally {

+				evalEnv.clear();

+				oclInstance.setExtentMap(null); // clear allInstances cache, and get the oclInstance ready for the next call

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		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());

+			for (String varName : environment.keySet()) {

+				EClassifier varType = environment.get(varName);

+				ecoreEnv.addElement(varName, createVar(ecoreEnv, varName, varType), false);

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		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));

+			return var;

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/parsers/MessageFormatParser.java
index fb6b95ab4c5..4670c394ddc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/parsers/MessageFormatParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/parsers/MessageFormatParser.java
@@ -1,211 +1,211 @@
-/**
- * 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.component.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.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.uml.diagram.component.part.Messages;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-
-/**
- * @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 = (EObject) 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 = (EObject) adapter.getAdapter(EObject.class);
-		return getViewProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString();
-	}
-}
+/**

+ * 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.component.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.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.uml.diagram.component.part.Messages;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+

+/**

+ * @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 = (EObject) 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 = (EObject) adapter.getAdapter(EObject.class);

+		return getViewProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/DiagramEditorContextMenuProvider.java
index 2c20c399455..519d93cba12 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/DiagramEditorContextMenuProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/DiagramEditorContextMenuProvider.java
@@ -1,62 +1,62 @@
-/**
- * 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.component.part;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @generated
- */
-public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider {
-
-	/**
-	 * @generated
-	 */
-	private IWorkbenchPart part;
-
-	/**
-	 * @generated
-	 */
-	public DiagramEditorContextMenuProvider(IWorkbenchPart part, EditPartViewer viewer) {
-		super(part, viewer);
-		this.part = part;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void buildContextMenu(final IMenuManager menu) {
-		getViewer().flush();
-		try {
-			TransactionUtil.getEditingDomain((EObject) getViewer().getContents().getModel())
-					.runExclusive(new Runnable() {
-
-						@Override
-						public void run() {
-							ContributionItemService.getInstance()
-									.contributeToPopupMenu(DiagramEditorContextMenuProvider.this, part);
-							menu.remove(ActionIds.ACTION_DELETE_FROM_MODEL);
-						}
-					});
-		} catch (Exception e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Error building context menu", e);
-		}
-	}
-}
+/**

+ * 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.component.part;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService;

+import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;

+import org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.ui.IWorkbenchPart;

+

+/**

+ * @generated

+ */

+public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider {

+

+	/**

+	 * @generated

+	 */

+	private IWorkbenchPart part;

+

+	/**

+	 * @generated

+	 */

+	public DiagramEditorContextMenuProvider(IWorkbenchPart part, EditPartViewer viewer) {

+		super(part, viewer);

+		this.part = part;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void buildContextMenu(final IMenuManager menu) {

+		getViewer().flush();

+		try {

+			TransactionUtil.getEditingDomain((EObject) getViewer().getContents().getModel())

+					.runExclusive(new Runnable() {

+

+						@Override

+						public void run() {

+							ContributionItemService.getInstance()

+									.contributeToPopupMenu(DiagramEditorContextMenuProvider.this, part);

+							menu.remove(ActionIds.ACTION_DELETE_FROM_MODEL);

+						}

+					});

+		} catch (Exception e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Error building context menu", e);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/LoadResourceAction.java
index 10bb45bef47..5169eba0cce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/LoadResourceAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/LoadResourceAction.java
@@ -1,30 +1,30 @@
-/**
- * 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.component.part;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.gmf.tooling.runtime.actions.DefaultLoadResourceAction;
-
-/**
- * @generated
- */
-public class LoadResourceAction extends DefaultLoadResourceAction {
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		return super.execute(event);
-	}
-}
+/**

+ * 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.component.part;

+

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.gmf.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.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLCreationWizard.java
index d6be408c16a..de869db3e84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLCreationWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLCreationWizard.java
@@ -1,176 +1,176 @@
-/**
- * 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.component.part;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-/**
- * @generated
- */
-public class UMLCreationWizard extends Wizard implements INewWizard {
-
-	/**
-	 * @generated
-	 */
-	private IWorkbench workbench;
-
-	/**
-	 * @generated
-	 */
-	protected IStructuredSelection selection;
-
-	/**
-	 * @generated
-	 */
-	protected UMLCreationWizardPage diagramModelFilePage;
-
-	/**
-	 * @generated
-	 */
-	protected UMLCreationWizardPage domainModelFilePage;
-
-	/**
-	 * @generated
-	 */
-	protected Resource diagram;
-
-	/**
-	 * @generated
-	 */
-	private boolean openNewlyCreatedDiagramEditor = true;
-
-	/**
-	 * @generated
-	 */
-	public IWorkbench getWorkbench() {
-		return workbench;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IStructuredSelection getSelection() {
-		return selection;
-	}
-
-	/**
-	 * @generated
-	 */
-	public final Resource getDiagram() {
-		return diagram;
-	}
-
-	/**
-	 * @generated
-	 */
-	public final boolean isOpenNewlyCreatedDiagramEditor() {
-		return openNewlyCreatedDiagramEditor;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setOpenNewlyCreatedDiagramEditor(boolean openNewlyCreatedDiagramEditor) {
-		this.openNewlyCreatedDiagramEditor = openNewlyCreatedDiagramEditor;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.workbench = workbench;
-		this.selection = selection;
-		setWindowTitle(Messages.UMLCreationWizardTitle);
-		setDefaultPageImageDescriptor(
-				UMLDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewUMLWizard.gif")); //$NON-NLS-1$
-		setNeedsProgressMonitor(true);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void addPages() {
-		diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), //$NON-NLS-1$
-				"PapyrusUMLComponent_diagram"); //$NON-NLS-1$
-		diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle);
-		diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription);
-		addPage(diagramModelFilePage);
-
-		domainModelFilePage = new UMLCreationWizardPage("DomainModelFile", getSelection(), "PapyrusUMLComponent") { //$NON-NLS-1$ //$NON-NLS-2$
-
-			@Override
-			public void setVisible(boolean visible) {
-				if (visible) {
-					String fileName = diagramModelFilePage.getFileName();
-					fileName = fileName.substring(0, fileName.length() - ".PapyrusUMLComponent_diagram".length()); //$NON-NLS-1$
-					setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), fileName,
-							"PapyrusUMLComponent")); //$NON-NLS-1$
-				}
-				super.setVisible(visible);
-			}
-		};
-		domainModelFilePage.setTitle(Messages.UMLCreationWizard_DomainModelFilePageTitle);
-		domainModelFilePage.setDescription(Messages.UMLCreationWizard_DomainModelFilePageDescription);
-		addPage(domainModelFilePage);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean performFinish() {
-		IRunnableWithProgress op = new WorkspaceModifyOperation(null) {
-
-			@Override
-			protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException {
-				diagram = UMLDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(),
-						domainModelFilePage.getURI(), monitor);
-				if (isOpenNewlyCreatedDiagramEditor() && diagram != null) {
-					try {
-						UMLDiagramEditorUtil.openDiagram(diagram);
-					} catch (PartInitException e) {
-						ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardOpenEditorError,
-								null, e.getStatus());
-					}
-				}
-			}
-		};
-		try {
-			getContainer().run(false, true, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			if (e.getTargetException() instanceof CoreException) {
-				ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardCreationError, null,
-						((CoreException) e.getTargetException()).getStatus());
-			} else {
-				UMLDiagramEditorPlugin.getInstance().logError("Error creating diagram", e.getTargetException()); //$NON-NLS-1$
-			}
-			return false;
-		}
-		return diagram != null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.component.part;

+

+import java.lang.reflect.InvocationTargetException;

+

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.jface.dialogs.ErrorDialog;

+import org.eclipse.jface.operation.IRunnableWithProgress;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.ui.INewWizard;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+

+/**

+ * @generated

+ */

+public class UMLCreationWizard extends Wizard implements INewWizard {

+

+	/**

+	 * @generated

+	 */

+	private IWorkbench workbench;

+

+	/**

+	 * @generated

+	 */

+	protected IStructuredSelection selection;

+

+	/**

+	 * @generated

+	 */

+	protected UMLCreationWizardPage diagramModelFilePage;

+

+	/**

+	 * @generated

+	 */

+	protected UMLCreationWizardPage domainModelFilePage;

+

+	/**

+	 * @generated

+	 */

+	protected Resource diagram;

+

+	/**

+	 * @generated

+	 */

+	private boolean openNewlyCreatedDiagramEditor = true;

+

+	/**

+	 * @generated

+	 */

+	public IWorkbench getWorkbench() {

+		return workbench;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IStructuredSelection getSelection() {

+		return selection;

+	}

+

+	/**

+	 * @generated

+	 */

+	public final Resource getDiagram() {

+		return diagram;

+	}

+

+	/**

+	 * @generated

+	 */

+	public final boolean isOpenNewlyCreatedDiagramEditor() {

+		return openNewlyCreatedDiagramEditor;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setOpenNewlyCreatedDiagramEditor(boolean openNewlyCreatedDiagramEditor) {

+		this.openNewlyCreatedDiagramEditor = openNewlyCreatedDiagramEditor;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void init(IWorkbench workbench, IStructuredSelection selection) {

+		this.workbench = workbench;

+		this.selection = selection;

+		setWindowTitle(Messages.UMLCreationWizardTitle);

+		setDefaultPageImageDescriptor(

+				UMLDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewUMLWizard.gif")); //$NON-NLS-1$

+		setNeedsProgressMonitor(true);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void addPages() {

+		diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), //$NON-NLS-1$

+				"PapyrusUMLComponent_diagram"); //$NON-NLS-1$

+		diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle);

+		diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription);

+		addPage(diagramModelFilePage);

+

+		domainModelFilePage = new UMLCreationWizardPage("DomainModelFile", getSelection(), "PapyrusUMLComponent") { //$NON-NLS-1$ //$NON-NLS-2$

+

+			@Override

+			public void setVisible(boolean visible) {

+				if (visible) {

+					String fileName = diagramModelFilePage.getFileName();

+					fileName = fileName.substring(0, fileName.length() - ".PapyrusUMLComponent_diagram".length()); //$NON-NLS-1$

+					setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), fileName,

+							"PapyrusUMLComponent")); //$NON-NLS-1$

+				}

+				super.setVisible(visible);

+			}

+		};

+		domainModelFilePage.setTitle(Messages.UMLCreationWizard_DomainModelFilePageTitle);

+		domainModelFilePage.setDescription(Messages.UMLCreationWizard_DomainModelFilePageDescription);

+		addPage(domainModelFilePage);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean performFinish() {

+		IRunnableWithProgress op = new WorkspaceModifyOperation(null) {

+

+			@Override

+			protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException {

+				diagram = UMLDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(),

+						domainModelFilePage.getURI(), monitor);

+				if (isOpenNewlyCreatedDiagramEditor() && diagram != null) {

+					try {

+						UMLDiagramEditorUtil.openDiagram(diagram);

+					} catch (PartInitException e) {

+						ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardOpenEditorError,

+								null, e.getStatus());

+					}

+				}

+			}

+		};

+		try {

+			getContainer().run(false, true, op);

+		} catch (InterruptedException e) {

+			return false;

+		} catch (InvocationTargetException e) {

+			if (e.getTargetException() instanceof CoreException) {

+				ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardCreationError, null,

+						((CoreException) e.getTargetException()).getStatus());

+			} else {

+				UMLDiagramEditorPlugin.getInstance().logError("Error creating diagram", e.getTargetException()); //$NON-NLS-1$

+			}

+			return false;

+		}

+		return diagram != null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLCreationWizardPage.java
index 5df6749373e..a9bb0816265 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLCreationWizardPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLCreationWizardPage.java
@@ -1,96 +1,96 @@
-/**
- * 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.component.part;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-/**
- * @generated
- */
-public class UMLCreationWizardPage extends WizardNewFileCreationPage {
-
-	/**
-	 * @generated
-	 */
-	private final String fileExtension;
-
-	/**
-	 * @generated
-	 */
-	public UMLCreationWizardPage(String pageName, IStructuredSelection selection, String fileExtension) {
-		super(pageName, selection);
-		this.fileExtension = fileExtension;
-	}
-
-	/**
-	 * Override to create files with this extension.
-	 *
-	 * @generated
-	 */
-	protected String getExtension() {
-		return fileExtension;
-	}
-
-	/**
-	 * @generated
-	 */
-	public URI getURI() {
-		return URI.createPlatformResourceURI(getFilePath().toString(), false);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IPath getFilePath() {
-		IPath path = getContainerFullPath();
-		if (path == null) {
-			path = new Path(""); //$NON-NLS-1$
-		}
-		String fileName = getFileName();
-		if (fileName != null) {
-			path = path.append(fileName);
-		}
-		return path;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), getFileName(), getExtension()));
-		setPageComplete(validatePage());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected boolean validatePage() {
-		if (!super.validatePage()) {
-			return false;
-		}
-		String extension = getExtension();
-		if (extension != null && !getFilePath().toString().endsWith("." + extension)) {
-			setErrorMessage(NLS.bind(Messages.UMLCreationWizardPageExtensionError, extension));
-			return false;
-		}
-		return true;
-	}
-}
+/**

+ * 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.component.part;

+

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+

+/**

+ * @generated

+ */

+public class UMLCreationWizardPage extends WizardNewFileCreationPage {

+

+	/**

+	 * @generated

+	 */

+	private final String fileExtension;

+

+	/**

+	 * @generated

+	 */

+	public UMLCreationWizardPage(String pageName, IStructuredSelection selection, String fileExtension) {

+		super(pageName, selection);

+		this.fileExtension = fileExtension;

+	}

+

+	/**

+	 * Override to create files with this extension.

+	 *

+	 * @generated

+	 */

+	protected String getExtension() {

+		return fileExtension;

+	}

+

+	/**

+	 * @generated

+	 */

+	public URI getURI() {

+		return URI.createPlatformResourceURI(getFilePath().toString(), false);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IPath getFilePath() {

+		IPath path = getContainerFullPath();

+		if (path == null) {

+			path = new Path(""); //$NON-NLS-1$

+		}

+		String fileName = getFileName();

+		if (fileName != null) {

+			path = path.append(fileName);

+		}

+		return path;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void createControl(Composite parent) {

+		super.createControl(parent);

+		setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), getFileName(), getExtension()));

+		setPageComplete(validatePage());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected boolean validatePage() {

+		if (!super.validatePage()) {

+			return false;

+		}

+		String extension = getExtension();

+		if (extension != null && !getFilePath().toString().endsWith("." + extension)) {

+			setErrorMessage(NLS.bind(Messages.UMLCreationWizardPageExtensionError, extension));

+			return false;

+		}

+		return true;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramActionBarContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramActionBarContributor.java
index 0bdfe3bccbe..0cd884e0fed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramActionBarContributor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramActionBarContributor.java
@@ -1,61 +1,61 @@
-/**
- * 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.component.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @generated
- */
-public class UMLDiagramActionBarContributor extends DiagramActionBarContributor {
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected Class<UMLDiagramEditor> getEditorClass() {
-		return UMLDiagramEditor.class;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getEditorId() {
-		return UMLDiagramEditor.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void init(IActionBars bars, IWorkbenchPage page) {
-		super.init(bars, page);
-		// print preview
-		IMenuManager fileMenu = bars.getMenuManager().findMenuUsingPath(IWorkbenchActionConstants.M_FILE);
-		assert fileMenu != null;
-		fileMenu.remove("pageSetupAction"); //$NON-NLS-1$
-		IMenuManager editMenu = bars.getMenuManager().findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
-		assert editMenu != null;
-		if (editMenu.find("validationGroup") == null) { //$NON-NLS-1$
-			editMenu.add(new GroupMarker("validationGroup")); //$NON-NLS-1$
-		}
-		IAction validateAction = new ValidateAction(page);
-		editMenu.appendToGroup("validationGroup", validateAction); //$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.part;

+

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;

+import org.eclipse.jface.action.GroupMarker;

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.ui.IActionBars;

+import org.eclipse.ui.IWorkbenchActionConstants;

+import org.eclipse.ui.IWorkbenchPage;

+

+/**

+ * @generated

+ */

+public class UMLDiagramActionBarContributor extends DiagramActionBarContributor {

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected Class<UMLDiagramEditor> getEditorClass() {

+		return UMLDiagramEditor.class;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected String getEditorId() {

+		return UMLDiagramEditor.ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void init(IActionBars bars, IWorkbenchPage page) {

+		super.init(bars, page);

+		// print preview

+		IMenuManager fileMenu = bars.getMenuManager().findMenuUsingPath(IWorkbenchActionConstants.M_FILE);

+		assert fileMenu != null;

+		fileMenu.remove("pageSetupAction"); //$NON-NLS-1$

+		IMenuManager editMenu = bars.getMenuManager().findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);

+		assert editMenu != null;

+		if (editMenu.find("validationGroup") == null) { //$NON-NLS-1$

+			editMenu.add(new GroupMarker("validationGroup")); //$NON-NLS-1$

+		}

+		IAction validateAction = new ValidateAction(page);

+		editMenu.appendToGroup("validationGroup", validateAction); //$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditor.java
index 3ea50b00259..3cdcab93f26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditor.java
@@ -1,550 +1,561 @@
-/**
- * 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.component.part;
-
-import java.util.EventObject;
-
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.KeyHandler;
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.commands.CommandStackListener;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gef.ui.palette.PaletteViewerProvider;
-import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;
-import org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent;
-import org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDragSourceListener;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.papyrus.commands.util.OperationHistoryDirtyState;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.gmfdiag.common.GmfMultiDiagramDocumentProvider;
-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.TransferData;
-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.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.ShowInContext;
-
-/**
- * @generated
- */
-public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderChangeListener, IGotoMarker {
-
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorID"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final String CONTEXT_ID = "org.eclipse.papyrus.uml.diagram.component.ui.diagramContext"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private KeyHandler paletteKeyHandler = null;
-
-	/**
-	 * @generated
-	 */
-	private MouseListener paletteMouseListener = null;
-
-	/**
-	 * @generated
-	 */
-	private OperationHistoryDirtyState dirtyState;
-
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain editingDomain;
-
-	/**
-	 * @generated
-	 */
-	private IDocumentProvider documentProvider;
-
-	/**
-	 * @generated
-	 */
-	public UMLDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {
-		super(servicesRegistry, diagram);
-
-		// adds a listener to the palette service, which reacts to palette customizations
-		PapyrusPaletteService.getInstance().addProviderChangeListener(this);
-
-		// Share the same editing provider
-		editingDomain = servicesRegistry.getService(TransactionalEditingDomain.class);
-		documentProvider = new GmfMultiDiagramDocumentProvider(editingDomain);
-
-		// overrides editing domain created by super constructor
-		setDocumentProvider(documentProvider);
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getContextID() {
-		return CONTEXT_ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {
-		PaletteRoot paletteRoot;
-		if (existingPaletteRoot == null) {
-			paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent());
-		} else {
-			PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent());
-			paletteRoot = existingPaletteRoot;
-		}
-		applyCustomizationsToPalette(paletteRoot);
-		return paletteRoot;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PreferencesHint getPreferencesHint() {
-		return UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getContributorId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
-		return documentProvider;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public TransactionalEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected final void setDocumentProvider(IEditorInput input) {
-		// Already set in the constructor
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void gotoMarker(IMarker marker) {
-		MarkerNavigationService.getInstance().gotoMarker(this, marker);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void doSaveAs() {
-		performSaveAs(new NullProgressMonitor());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performSaveAs(IProgressMonitor progressMonitor) {
-		// Nothing
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ShowInContext getShowInContext() {
-		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void configureGraphicalViewer() {
-		super.configureGraphicalViewer();
-		DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(this,
-				getDiagramGraphicalViewer());
-		getDiagramGraphicalViewer().setContextMenu(provider);
-		getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU, provider, getDiagramGraphicalViewer());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TransactionalEditingDomain createEditingDomain() {
-		// Already configured
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void configureDiagramEditDomain() {
-		super.configureDiagramEditDomain();
-		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
-
-			@Override
-			public void commandStackChanged(EventObject event) {
-				firePropertyChange(IEditorPart.PROP_DIRTY);
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void doSave(IProgressMonitor progressMonitor) {
-		// The saving of the resource is done by the CoreMultiDiagramEditor
-		getDirtyState().saved();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected OperationHistoryDirtyState getDirtyState() {
-		if (dirtyState == null) {
-			dirtyState = OperationHistoryDirtyState.newInstance(getUndoContext(), getOperationHistory());
-		}
-		return dirtyState;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setUndoContext(IUndoContext context) {
-		if (dirtyState != null) {
-			dirtyState.dispose();
-			dirtyState = null;
-		}
-
-		super.setUndoContext(context);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isDirty() {
-		return getDirtyState().isDirty();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void providerChanged(ProviderChangeEvent event) {
-		// update the palette if the palette service has changed
-		if (PapyrusPaletteService.getInstance().equals(event.getSource())) {
-			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this,
-					getDefaultPaletteContent());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		// remove palette service listener
-		// remove preference listener
-		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);
-
-		if (dirtyState != null) {
-			dirtyState.dispose();
-			dirtyState = null;
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer getPaletteViewer() {
-		return getEditDomain().getPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PaletteViewer constructPaletteViewer() {
-		return new PapyrusPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PaletteViewerProvider createPaletteViewerProvider() {
-		getEditDomain().setPaletteRoot(createPaletteRoot(null));
-		return new PaletteViewerProvider(getEditDomain()) {
-
-			/**
-			 * Override to provide the additional behavior for the tools. Will intialize with a
-			 * PaletteEditPartFactory that has a TrackDragger that understand how to handle the
-			 * mouseDoubleClick event for shape creation tools. Also will initialize the palette
-			 * with a defaultTool that is the SelectToolEx that undestands how to handle the enter
-			 * key which will result in the creation of the shape also.
-			 */
-			@Override
-			protected void configurePaletteViewer(PaletteViewer viewer) {
-				super.configurePaletteViewer(viewer);
-
-				// customize menu...
-				viewer.setContextMenu(new PapyrusPaletteContextMenuProvider(viewer));
-
-				viewer.getKeyHandler().setParent(getPaletteKeyHandler());
-				viewer.getControl().addMouseListener(getPaletteMouseListener());
-
-				// Add a transfer drag target listener that is supported on
-				// palette template entries whose template is a creation tool.
-				// This will enable drag and drop of the palette shape creation
-				// tools.
-				viewer.addDragSourceListener(new PaletteToolTransferDragSourceListener(viewer));
-				viewer.setCustomizer(createPaletteCustomizer());
-			}
-
-			@Override
-			public PaletteViewer createPaletteViewer(Composite parent) {
-				PaletteViewer pViewer = constructPaletteViewer();
-				pViewer.createControl(parent);
-				configurePaletteViewer(pViewer);
-				hookPaletteViewer(pViewer);
-				return pViewer;
-			}
-
-			/**
-			 * @return Palette Key Handler for the palette
-			 */
-			private KeyHandler getPaletteKeyHandler() {
-
-				if (paletteKeyHandler == null) {
-
-					paletteKeyHandler = new KeyHandler() {
-
-						/**
-						 * Processes a <i>key released </i> event. This method is called by the Tool
-						 * 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
-						 */
-						@Override
-						public boolean keyReleased(KeyEvent event) {
-
-							if (event.keyCode == SWT.Selection) {
-
-								Tool tool = getPaletteViewer().getActiveTool().createTool();
-
-								if (toolSupportsAccessibility(tool)) {
-
-									tool.keyUp(event, getDiagramGraphicalViewer());
-
-									// deactivate current selection
-									getPaletteViewer().setActiveTool(null);
-
-									return true;
-								}
-
-							}
-							return super.keyReleased(event);
-						}
-
-					};
-
-				}
-				return paletteKeyHandler;
-			}
-
-			/**
-			 * @return Palette Mouse listener for the palette
-			 */
-			private MouseListener getPaletteMouseListener() {
-
-				if (paletteMouseListener == null) {
-
-					paletteMouseListener = new MouseListener() {
-
-						/**
-						 * Flag to indicate that the current active tool should be cleared after a
-						 * mouse double-click event.
-						 */
-						private boolean clearActiveTool = false;
-
-						/**
-						 * Override to support double-clicking a palette tool entry to create a
-						 * shape or connection (between two selected shapes).
-						 * 
-						 * @see MouseListener#mouseDoubleClick(MouseEvent)
-						 */
-						@Override
-						public void mouseDoubleClick(MouseEvent e) {
-							Tool tool = getPaletteViewer().getActiveTool().createTool();
-
-							if (toolSupportsAccessibility(tool)) {
-
-								tool.setViewer(getDiagramGraphicalViewer());
-								tool.setEditDomain(getDiagramGraphicalViewer().getEditDomain());
-								tool.mouseDoubleClick(e, getDiagramGraphicalViewer());
-
-								// Current active tool should be deactivated,
-								// but if it is down here it will get
-								// reactivated deep in GEF palette code after
-								// receiving mouse up events.
-								clearActiveTool = true;
-							}
-						}
-
-						@Override
-						public void mouseDown(MouseEvent e) {
-							// do nothing
-						}
-
-						@Override
-						public void mouseUp(MouseEvent e) {
-							// Deactivate current active tool here if a
-							// double-click was handled.
-							if (clearActiveTool) {
-								getPaletteViewer().setActiveTool(null);
-								clearActiveTool = false;
-							}
-
-						}
-					};
-
-				}
-				return paletteMouseListener;
-			}
-
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public GraphicalViewer getGraphicalViewer() {
-		return super.getGraphicalViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeGraphicalViewer() {
-		super.initializeGraphicalViewer();
-
-		// Enable Drop
-		getDiagramGraphicalViewer().addDropTargetListener(
-				new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) {
-
-					@Override
-					protected Object getJavaObject(TransferData data) {
-						// It is usual for the transfer data not to be set because it is available locally
-						return LocalSelectionTransfer.getTransfer().getSelection();
-					}
-
-					@Override
-					protected TransactionalEditingDomain getTransactionalEditingDomain() {
-						return getEditingDomain();
-					}
-				});
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {
-			IMultiDiagramEditor editor = (IMultiDiagramEditor) getSite().getPage().getActiveEditor();
-			// If not the active editor, ignore selection changed.
-			if (this.equals(editor.getActiveEditor())) {
-				updateActions(getSelectionActions());
-				super.selectionChanged(part, selection);
-			} else {
-				super.selectionChanged(part, selection);
-			}
-		} else {
-			super.selectionChanged(part, selection);
-		}
-		// from
-		// org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart,
-		// ISelection)
-		if (part == this) {
-			rebuildStatusLine();
-		}
-	}
-}
+/**

+ * 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.component.part;

+

+import java.util.EventObject;

+

+import org.eclipse.core.commands.operations.IUndoContext;

+import org.eclipse.core.resources.IMarker;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.GraphicalViewer;

+import org.eclipse.gef.KeyHandler;

+import org.eclipse.gef.Tool;

+import org.eclipse.gef.commands.CommandStackListener;

+import org.eclipse.gef.palette.PaletteRoot;

+import org.eclipse.gef.ui.palette.PaletteViewer;

+import org.eclipse.gef.ui.palette.PaletteViewerProvider;

+import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;

+import org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent;

+import org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService;

+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

+import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;

+import org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDragSourceListener;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.util.LocalSelectionTransfer;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.papyrus.commands.util.OperationHistoryDirtyState;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

+import org.eclipse.papyrus.infra.gmfdiag.common.GmfMultiDiagramDocumentProvider;

+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;

+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.dnd.TransferData;

+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;

+import org.eclipse.ui.ide.IGotoMarker;

+import org.eclipse.ui.part.ShowInContext;

+

+/**

+ * @generated

+ */

+public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderChangeListener, IGotoMarker {

+

+	/**

+	 * @generated

+	 */

+	public static final String ID = "org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorID"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final String CONTEXT_ID = "org.eclipse.papyrus.uml.diagram.component.ui.diagramContext"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private KeyHandler paletteKeyHandler = null;

+

+	/**

+	 * @generated

+	 */

+	private MouseListener paletteMouseListener = null;

+

+	/**

+	 * @generated

+	 */

+	private OperationHistoryDirtyState dirtyState;

+

+	/**

+	 * @generated

+	 */

+	private TransactionalEditingDomain editingDomain;

+

+	/**

+	 * @generated

+	 */

+	private IDocumentProvider documentProvider;

+

+	/**

+	 * @generated

+	 */

+	public UMLDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {

+		super(servicesRegistry, diagram);

+

+		// adds a listener to the palette service, which reacts to palette customizations

+		PapyrusPaletteService.getInstance().addProviderChangeListener(this);

+

+		// Share the same editing provider

+		editingDomain = servicesRegistry.getService(TransactionalEditingDomain.class);

+		documentProvider = new GmfMultiDiagramDocumentProvider(editingDomain);

+

+		// overrides editing domain created by super constructor

+		setDocumentProvider(documentProvider);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected String getContextID() {

+		return CONTEXT_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {

+		PaletteRoot paletteRoot;

+		if (existingPaletteRoot == null) {

+			paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent());

+		} else {

+			PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent());

+			paletteRoot = existingPaletteRoot;

+		}

+		applyCustomizationsToPalette(paletteRoot);

+		return paletteRoot;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected PreferencesHint getPreferencesHint() {

+		return UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getContributorId() {

+		return UMLDiagramEditorPlugin.ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {

+		return documentProvider;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public TransactionalEditingDomain getEditingDomain() {

+		return editingDomain;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected final void setDocumentProvider(IEditorInput input) {

+		// Already set in the constructor

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void gotoMarker(IMarker marker) {

+		MarkerNavigationService.getInstance().gotoMarker(this, marker);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean isSaveAsAllowed() {

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void doSaveAs() {

+		performSaveAs(new NullProgressMonitor());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performSaveAs(IProgressMonitor progressMonitor) {

+		// Nothing

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ShowInContext getShowInContext() {

+		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void configureGraphicalViewer() {

+		super.configureGraphicalViewer();

+		DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(this,

+				getDiagramGraphicalViewer());

+		getDiagramGraphicalViewer().setContextMenu(provider);

+		getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU, provider, getDiagramGraphicalViewer());

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected TransactionalEditingDomain createEditingDomain() {

+		// Already configured

+		return editingDomain;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void configureDiagramEditDomain() {

+		super.configureDiagramEditDomain();

+		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {

+

+			@Override

+			public void commandStackChanged(EventObject event) {

+				if (Display.getCurrent() == null) {

+					Display.getDefault().asyncExec(new Runnable() {

+

+						@Override

+						public void run() {

+							firePropertyChange(IEditorPart.PROP_DIRTY);

+						}

+					});

+				} else {

+					firePropertyChange(IEditorPart.PROP_DIRTY);

+				}

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void doSave(IProgressMonitor progressMonitor) {

+		// The saving of the resource is done by the CoreMultiDiagramEditor

+		getDirtyState().saved();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected OperationHistoryDirtyState getDirtyState() {

+		if (dirtyState == null) {

+			dirtyState = OperationHistoryDirtyState.newInstance(getUndoContext(), getOperationHistory());

+		}

+		return dirtyState;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setUndoContext(IUndoContext context) {

+		if (dirtyState != null) {

+			dirtyState.dispose();

+			dirtyState = null;

+		}

+

+		super.setUndoContext(context);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean isDirty() {

+		return getDirtyState().isDirty();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void providerChanged(ProviderChangeEvent event) {

+		// update the palette if the palette service has changed

+		if (PapyrusPaletteService.getInstance().equals(event.getSource())) {

+			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this,

+					getDefaultPaletteContent());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void dispose() {

+		// remove palette service listener

+		// remove preference listener

+		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);

+

+		if (dirtyState != null) {

+			dirtyState.dispose();

+			dirtyState = null;

+		}

+

+		super.dispose();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected PaletteViewer getPaletteViewer() {

+		return getEditDomain().getPaletteViewer();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected PaletteViewer constructPaletteViewer() {

+		return new PapyrusPaletteViewer();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected PaletteViewerProvider createPaletteViewerProvider() {

+		getEditDomain().setPaletteRoot(createPaletteRoot(null));

+		return new PaletteViewerProvider(getEditDomain()) {

+

+			/**

+			 * Override to provide the additional behavior for the tools. Will intialize with a

+			 * PaletteEditPartFactory that has a TrackDragger that understand how to handle the

+			 * mouseDoubleClick event for shape creation tools. Also will initialize the palette

+			 * with a defaultTool that is the SelectToolEx that undestands how to handle the enter

+			 * key which will result in the creation of the shape also.

+			 */

+			@Override

+			protected void configurePaletteViewer(PaletteViewer viewer) {

+				super.configurePaletteViewer(viewer);

+

+				// customize menu...

+				viewer.setContextMenu(new PapyrusPaletteContextMenuProvider(viewer));

+

+				viewer.getKeyHandler().setParent(getPaletteKeyHandler());

+				viewer.getControl().addMouseListener(getPaletteMouseListener());

+

+				// Add a transfer drag target listener that is supported on

+				// palette template entries whose template is a creation tool.

+				// This will enable drag and drop of the palette shape creation

+				// tools.

+				viewer.addDragSourceListener(new PaletteToolTransferDragSourceListener(viewer));

+				viewer.setCustomizer(createPaletteCustomizer());

+			}

+

+			@Override

+			public PaletteViewer createPaletteViewer(Composite parent) {

+				PaletteViewer pViewer = constructPaletteViewer();

+				pViewer.createControl(parent);

+				configurePaletteViewer(pViewer);

+				hookPaletteViewer(pViewer);

+				return pViewer;

+			}

+

+			/**

+			 * @return Palette Key Handler for the palette

+			 */

+			private KeyHandler getPaletteKeyHandler() {

+

+				if (paletteKeyHandler == null) {

+

+					paletteKeyHandler = new KeyHandler() {

+

+						/**

+						 * Processes a <i>key released </i> event. This method is called by the Tool

+						 * 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

+						 */

+						@Override

+						public boolean keyReleased(KeyEvent event) {

+

+							if (event.keyCode == SWT.Selection) {

+

+								Tool tool = getPaletteViewer().getActiveTool().createTool();

+

+								if (toolSupportsAccessibility(tool)) {

+

+									tool.keyUp(event, getDiagramGraphicalViewer());

+

+									// deactivate current selection

+									getPaletteViewer().setActiveTool(null);

+

+									return true;

+								}

+

+							}

+							return super.keyReleased(event);

+						}

+

+					};

+

+				}

+				return paletteKeyHandler;

+			}

+

+			/**

+			 * @return Palette Mouse listener for the palette

+			 */

+			private MouseListener getPaletteMouseListener() {

+

+				if (paletteMouseListener == null) {

+

+					paletteMouseListener = new MouseListener() {

+

+						/**

+						 * Flag to indicate that the current active tool should be cleared after a

+						 * mouse double-click event.

+						 */

+						private boolean clearActiveTool = false;

+

+						/**

+						 * Override to support double-clicking a palette tool entry to create a

+						 * shape or connection (between two selected shapes).

+						 * 

+						 * @see MouseListener#mouseDoubleClick(MouseEvent)

+						 */

+						@Override

+						public void mouseDoubleClick(MouseEvent e) {

+							Tool tool = getPaletteViewer().getActiveTool().createTool();

+

+							if (toolSupportsAccessibility(tool)) {

+

+								tool.setViewer(getDiagramGraphicalViewer());

+								tool.setEditDomain(getDiagramGraphicalViewer().getEditDomain());

+								tool.mouseDoubleClick(e, getDiagramGraphicalViewer());

+

+								// Current active tool should be deactivated,

+								// but if it is down here it will get

+								// reactivated deep in GEF palette code after

+								// receiving mouse up events.

+								clearActiveTool = true;

+							}

+						}

+

+						@Override

+						public void mouseDown(MouseEvent e) {

+							// do nothing

+						}

+

+						@Override

+						public void mouseUp(MouseEvent e) {

+							// Deactivate current active tool here if a

+							// double-click was handled.

+							if (clearActiveTool) {

+								getPaletteViewer().setActiveTool(null);

+								clearActiveTool = false;

+							}

+

+						}

+					};

+

+				}

+				return paletteMouseListener;

+			}

+

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public GraphicalViewer getGraphicalViewer() {

+		return super.getGraphicalViewer();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void initializeGraphicalViewer() {

+		super.initializeGraphicalViewer();

+

+		// Enable Drop

+		getDiagramGraphicalViewer().addDropTargetListener(

+				new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) {

+

+					@Override

+					protected Object getJavaObject(TransferData data) {

+						// It is usual for the transfer data not to be set because it is available locally

+						return LocalSelectionTransfer.getTransfer().getSelection();

+					}

+

+					@Override

+					protected TransactionalEditingDomain getTransactionalEditingDomain() {

+						return getEditingDomain();

+					}

+				});

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void selectionChanged(IWorkbenchPart part, ISelection selection) {

+		if (getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {

+			IMultiDiagramEditor editor = (IMultiDiagramEditor) getSite().getPage().getActiveEditor();

+			// If not the active editor, ignore selection changed.

+			if (this.equals(editor.getActiveEditor())) {

+				updateActions(getSelectionActions());

+				super.selectionChanged(part, selection);

+			} else {

+				super.selectionChanged(part, selection);

+			}

+		} else {

+			super.selectionChanged(part, selection);

+		}

+		// from

+		// org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart,

+		// ISelection)

+		if (part == this) {

+			rebuildStatusLine();

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditorPlugin.java
index e44573fdaa1..f8b6d8fd454 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditorPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditorPlugin.java
@@ -1,299 +1,299 @@
-/**
- * Copyright (c) 2014 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *  Christian W. Damus (CEA) - bug 410346
- */
-package org.eclipse.papyrus.uml.diagram.component.part;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.expressions.UMLOCLFactory;
-import org.eclipse.papyrus.uml.diagram.component.preferences.DiagramPreferenceInitializer;
-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * @generated
- */
-public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
-
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.papyrus.uml.diagram.component"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private LogHelper myLogHelper;
-
-	/**
-	 * @generated
-	 */
-	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(ID);
-
-	/**
-	 * @generated
-	 */
-	private static UMLDiagramEditorPlugin instance;
-
-	/**
-	 * @generated
-	 */
-	private AdapterFactory adapterFactory;
-
-	/**
-	 * @generated
-	 */
-	private UMLDocumentProvider documentProvider;
-
-	/**
-	 * @generated
-	 */
-	private UMLBaseItemSemanticEditPolicy.LinkConstraints linkConstraints;
-
-	/**
-	 * @generated
-	 */
-	private ElementInitializers initializers;
-
-	/**
-	 * @generated
-	 */
-	private UMLOCLFactory oclFactory;
-
-	/**
-	 * @generated
-	 */
-	public UMLDiagramEditorPlugin() {
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		instance = this;
-		myLogHelper = new LogHelper(this);
-		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());
-		adapterFactory = org.eclipse.papyrus.infra.gmfdiag.common.Activator.getInstance()
-				.getItemProvidersAdapterFactory();
-		DiagramPreferenceInitializer diagramPreferenceInitializer = new DiagramPreferenceInitializer();
-		diagramPreferenceInitializer.initializeDefaultPreferences();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		adapterFactory = null;
-		linkConstraints = null;
-		initializers = null;
-		oclFactory = null;
-		instance = null;
-		super.stop(context);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static UMLDiagramEditorPlugin getInstance() {
-		return instance;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IPreferenceStore getPreferenceStore() {
-		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		return store;
-	}
-
-	/**
-	 * @generated
-	 */
-	public AdapterFactory getItemProvidersAdapterFactory() {
-		return adapterFactory;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ImageDescriptor getItemImageDescriptor(Object item) {
-		IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory.adapt(item, IItemLabelProvider.class);
-		if (labelProvider != null) {
-			return ExtendedImageRegistry.getInstance().getImageDescriptor(labelProvider.getImage(item));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @generated
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getBundledImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(ID, path);
-	}
-
-	/**
-	 * Respects images residing in any plug-in. If path is relative,
-	 * then this bundle is looked up for the image, otherwise, for absolute
-	 * path, first segment is taken as id of plug-in with image
-	 *
-	 * @generated
-	 * @param path
-	 *            the path to image, either absolute (with plug-in id as first segment), or relative for bundled images
-	 * @return the image descriptor
-	 */
-	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());
-		} else {
-			return getBundledImageDescriptor(p.makeAbsolute().toString());
-		}
-	}
-
-	/**
-	 * Returns an image for the image file at the given plugin relative path.
-	 * Client do not need to dispose this image. Images will be disposed automatically.
-	 *
-	 * @generated
-	 * @param path
-	 *            the path
-	 * @return image instance
-	 */
-	public Image getBundledImage(String path) {
-		Image image = getImageRegistry().get(path);
-		if (image == null) {
-			getImageRegistry().put(path, getBundledImageDescriptor(path));
-			image = getImageRegistry().get(path);
-		}
-		return image;
-	}
-
-	/**
-	 * Returns string from plug-in's resource bundle
-	 *
-	 * @generated
-	 */
-	public static String getString(String key) {
-		return Platform.getResourceString(getInstance().getBundle(), "%" + key); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public UMLDocumentProvider getDocumentProvider() {
-		if (documentProvider == null) {
-			documentProvider = new UMLDocumentProvider();
-		}
-		return documentProvider;
-	}
-
-	/**
-	 * @generated
-	 */
-	public UMLBaseItemSemanticEditPolicy.LinkConstraints getLinkConstraints() {
-		return linkConstraints;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLinkConstraints(UMLBaseItemSemanticEditPolicy.LinkConstraints lc) {
-		this.linkConstraints = lc;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ElementInitializers getElementInitializers() {
-		return initializers;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setElementInitializers(ElementInitializers i) {
-		this.initializers = i;
-	}
-
-	/**
-	 * @generated
-	 */
-	public UMLOCLFactory getUMLOCLFactory() {
-		return oclFactory;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setUMLOCLFactory(UMLOCLFactory f) {
-		this.oclFactory = f;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void logError(String error) {
-		getLogHelper().warn(error);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void logError(String error, Throwable throwable) {
-		getLogHelper().error(error, throwable);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void logInfo(String message) {
-		getLogHelper().info(message);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void logInfo(String message, Throwable throwable) {
-		getLogHelper().error(message, throwable);
-	}
-
-	/**
-	 * @generated
-	 */
-	public LogHelper getLogHelper() {
-		return myLogHelper;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 410346

+ */

+package org.eclipse.papyrus.uml.diagram.component.part;

+

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.component.preferences.DiagramPreferenceInitializer;

+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.osgi.framework.BundleContext;

+

+/**

+ * @generated

+ */

+public class UMLDiagramEditorPlugin extends AbstractUIPlugin {

+

+	/**

+	 * @generated

+	 */

+	public static final String ID = "org.eclipse.papyrus.uml.diagram.component"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private LogHelper myLogHelper;

+

+	/**

+	 * @generated

+	 */

+	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(ID);

+

+	/**

+	 * @generated

+	 */

+	private static UMLDiagramEditorPlugin instance;

+

+	/**

+	 * @generated

+	 */

+	private AdapterFactory adapterFactory;

+

+	/**

+	 * @generated

+	 */

+	private UMLDocumentProvider documentProvider;

+

+	/**

+	 * @generated

+	 */

+	private UMLBaseItemSemanticEditPolicy.LinkConstraints linkConstraints;

+

+	/**

+	 * @generated

+	 */

+	private ElementInitializers initializers;

+

+	/**

+	 * @generated

+	 */

+	private UMLOCLFactory oclFactory;

+

+	/**

+	 * @generated

+	 */

+	public UMLDiagramEditorPlugin() {

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		instance = this;

+		myLogHelper = new LogHelper(this);

+		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());

+		adapterFactory = org.eclipse.papyrus.infra.gmfdiag.common.Activator.getInstance()

+				.getItemProvidersAdapterFactory();

+		DiagramPreferenceInitializer diagramPreferenceInitializer = new DiagramPreferenceInitializer();

+		diagramPreferenceInitializer.initializeDefaultPreferences();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void stop(BundleContext context) throws Exception {

+		adapterFactory = null;

+		linkConstraints = null;

+		initializers = null;

+		oclFactory = null;

+		instance = null;

+		super.stop(context);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static UMLDiagramEditorPlugin getInstance() {

+		return instance;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IPreferenceStore getPreferenceStore() {

+		IPreferenceStore store = Activator.getDefault().getPreferenceStore();

+		return store;

+	}

+

+	/**

+	 * @generated

+	 */

+	public AdapterFactory getItemProvidersAdapterFactory() {

+		return adapterFactory;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ImageDescriptor getItemImageDescriptor(Object item) {

+		IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory.adapt(item, IItemLabelProvider.class);

+		if (labelProvider != null) {

+			return ExtendedImageRegistry.getInstance().getImageDescriptor(labelProvider.getImage(item));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns an image descriptor for the image file at the given

+	 * plug-in relative path.

+	 *

+	 * @generated

+	 * @param path

+	 *            the path

+	 * @return the image descriptor

+	 */

+	public static ImageDescriptor getBundledImageDescriptor(String path) {

+		return AbstractUIPlugin.imageDescriptorFromPlugin(ID, path);

+	}

+

+	/**

+	 * Respects images residing in any plug-in. If path is relative,

+	 * then this bundle is looked up for the image, otherwise, for absolute

+	 * path, first segment is taken as id of plug-in with image

+	 *

+	 * @generated

+	 * @param path

+	 *            the path to image, either absolute (with plug-in id as first segment), or relative for bundled images

+	 * @return the image descriptor

+	 */

+	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());

+		} else {

+			return getBundledImageDescriptor(p.makeAbsolute().toString());

+		}

+	}

+

+	/**

+	 * Returns an image for the image file at the given plugin relative path.

+	 * Client do not need to dispose this image. Images will be disposed automatically.

+	 *

+	 * @generated

+	 * @param path

+	 *            the path

+	 * @return image instance

+	 */

+	public Image getBundledImage(String path) {

+		Image image = getImageRegistry().get(path);

+		if (image == null) {

+			getImageRegistry().put(path, getBundledImageDescriptor(path));

+			image = getImageRegistry().get(path);

+		}

+		return image;

+	}

+

+	/**

+	 * Returns string from plug-in's resource bundle

+	 *

+	 * @generated

+	 */

+	public static String getString(String key) {

+		return Platform.getResourceString(getInstance().getBundle(), "%" + key); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	public UMLDocumentProvider getDocumentProvider() {

+		if (documentProvider == null) {

+			documentProvider = new UMLDocumentProvider();

+		}

+		return documentProvider;

+	}

+

+	/**

+	 * @generated

+	 */

+	public UMLBaseItemSemanticEditPolicy.LinkConstraints getLinkConstraints() {

+		return linkConstraints;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLinkConstraints(UMLBaseItemSemanticEditPolicy.LinkConstraints lc) {

+		this.linkConstraints = lc;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ElementInitializers getElementInitializers() {

+		return initializers;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setElementInitializers(ElementInitializers i) {

+		this.initializers = i;

+	}

+

+	/**

+	 * @generated

+	 */

+	public UMLOCLFactory getUMLOCLFactory() {

+		return oclFactory;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setUMLOCLFactory(UMLOCLFactory f) {

+		this.oclFactory = f;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void logError(String error) {

+		getLogHelper().warn(error);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void logError(String error, Throwable throwable) {

+		getLogHelper().error(error, throwable);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void logInfo(String message) {

+		getLogHelper().info(message);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void logInfo(String message, Throwable throwable) {

+		getLogHelper().error(message, throwable);

+	}

+

+	/**

+	 * @generated

+	 */

+	public LogHelper getLogHelper() {

+		return myLogHelper;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditorUtil.java
index cb0837d7076..4601ae2dfa3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditorUtil.java
@@ -1,371 +1,369 @@
-/**
- * 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.component.part;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-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.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class UMLDiagramEditorUtil {
-
-	/**
-	 * @generated
-	 */
-	public static Map<?, ?> getSaveOptions() {
-		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;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static boolean openDiagram(Resource diagram) throws PartInitException {
-		String path = diagram.getURI().toPlatformString(true);
-		IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path));
-		if (workspaceResource instanceof IFile) {
-			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-			return null != page.openEditor(new FileEditorInput((IFile) workspaceResource), UMLDiagramEditor.ID);
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void setCharset(IFile file) {
-		if (file == null) {
-			return;
-		}
-		try {
-			file.setCharset("UTF-8", new NullProgressMonitor()); //$NON-NLS-1$
-		} catch (CoreException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Unable to set charset for file " + file.getFullPath(), e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public static String getUniqueFileName(IPath containerFullPath, String fileName, String extension) {
-		return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, fileName, extension,
-				DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE);
-	}
-
-	/**
-	 * Runs the wizard in a dialog.
-	 *
-	 * @generated
-	 */
-	public static void runWizard(Shell shell, Wizard wizard, String settingsKey) {
-		IDialogSettings pluginDialogSettings = UMLDiagramEditorPlugin.getInstance().getDialogSettings();
-		IDialogSettings wizardDialogSettings = pluginDialogSettings.getSection(settingsKey);
-		if (wizardDialogSettings == null) {
-			wizardDialogSettings = pluginDialogSettings.addNewSection(settingsKey);
-		}
-		wizard.setDialogSettings(wizardDialogSettings);
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-		dialog.create();
-		dialog.getShell().setSize(Math.max(500, dialog.getShell().getSize().x), 500);
-		dialog.open();
-	}
-
-	/**
-	 * 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) {
-		TransactionalEditingDomain editingDomain = WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain();
-		progressMonitor.beginTask(Messages.UMLDiagramEditorUtil_CreateDiagramProgressTask, 3);
-		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) {
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-					throws ExecutionException {
-				Package model = createInitialModel();
-				attachModelToResource(model, modelResource);
-
-				Diagram diagram = ViewService.createDiagram(model, ComponentDiagramEditPart.MODEL_ID,
-						UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-				if (diagram != null) {
-					diagramResource.getContents().add(diagram);
-					diagram.setName(diagramName);
-					diagram.setElement(model);
-				}
-
-				try {
-					modelResource
-							.save(org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorUtil.getSaveOptions());
-					diagramResource
-							.save(org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorUtil.getSaveOptions());
-				} catch (IOException e) {
-
-					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$
-				}
-				return CommandResult.newOKCommandResult();
-			}
-		};
-		try {
-			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$
-		}
-		setCharset(WorkspaceSynchronizer.getFile(modelResource));
-		setCharset(WorkspaceSynchronizer.getFile(diagramResource));
-		return diagramResource;
-	}
-
-	/**
-	 * Create a new instance of domain element associated with canvas.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private static Package createInitialModel() {
-		return UMLFactory.eINSTANCE.createPackage();
-	}
-
-	/**
-	 * Store model element in the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private static void attachModelToResource(Package model, Resource resource) {
-		resource.getContents().add(model);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) {
-		diagramPart.getDiagramGraphicalViewer().deselectAll();
-
-		EditPart firstPrimary = null;
-		for (EditPart nextPart : editParts) {
-			diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart);
-			if (firstPrimary == null && nextPart instanceof IPrimaryEditPart) {
-				firstPrimary = nextPart;
-			}
-		}
-
-		if (!editParts.isEmpty()) {
-			diagramPart.getDiagramGraphicalViewer()
-					.reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0));
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static int findElementsInDiagramByID(DiagramEditPart diagramPart, EObject element,
-			List<EditPart> editPartCollector) {
-		IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer) diagramPart.getViewer();
-		final int intialNumOfEditParts = editPartCollector.size();
-
-		if (element instanceof View) { // support notation element lookup
-			EditPart editPart = (EditPart) viewer.getEditPartRegistry().get(element);
-			if (editPart != null) {
-				editPartCollector.add(editPart);
-				return 1;
-			}
-		}
-
-		String elementID = EMFCoreUtil.getProxyID(element);
-		@SuppressWarnings("unchecked")
-		List<EditPart> associatedParts = viewer.findEditPartsForElement(elementID, IGraphicalEditPart.class);
-		// perform the possible hierarchy disjoint -> take the top-most parts only
-		for (EditPart nextPart : associatedParts) {
-			EditPart parentPart = nextPart.getParent();
-			while (parentPart != null && !associatedParts.contains(parentPart)) {
-				parentPart = parentPart.getParent();
-			}
-			if (parentPart == null) {
-				editPartCollector.add(nextPart);
-			}
-		}
-
-		if (intialNumOfEditParts == editPartCollector.size()) {
-			if (!associatedParts.isEmpty()) {
-				editPartCollector.add(associatedParts.get(0));
-			} else {
-				if (element.eContainer() != null) {
-					return findElementsInDiagramByID(diagramPart, element.eContainer(), editPartCollector);
-				}
-			}
-		}
-		return editPartCollector.size() - intialNumOfEditParts;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static View findView(DiagramEditPart diagramEditPart, EObject targetElement,
-			LazyElement2ViewMap lazyElement2ViewMap) {
-		boolean hasStructuralURI = false;
-		if (targetElement.eResource() instanceof XMLResource) {
-			hasStructuralURI = ((XMLResource) targetElement.eResource()).getID(targetElement) == null;
-		}
-
-		View view = null;
-		LinkedList<EditPart> editPartHolder = new LinkedList<EditPart>();
-		if (hasStructuralURI && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) {
-			view = lazyElement2ViewMap.getElement2ViewMap().get(targetElement);
-		} else if (findElementsInDiagramByID(diagramEditPart, targetElement, editPartHolder) > 0) {
-			EditPart editPart = editPartHolder.get(0);
-			view = editPart.getModel() instanceof View ? (View) editPart.getModel() : null;
-		}
-
-		return (view == null) ? diagramEditPart.getDiagramView() : view;
-	}
-
-	/**
-	 * XXX This is quite suspicious code (especially editPartTmpHolder) and likely to be removed soon
-	 *
-	 * @generated
-	 */
-	public static class LazyElement2ViewMap {
-
-		/**
-		 * @generated
-		 */
-		private Map<EObject, View> element2ViewMap;
-
-		/**
-		 * @generated
-		 */
-		private View scope;
-
-		/**
-		 * @generated
-		 */
-		private Set<? extends EObject> elementSet;
-
-		/**
-		 * @generated
-		 */
-		public LazyElement2ViewMap(View scope, Set<? extends EObject> elements) {
-			this.scope = scope;
-			this.elementSet = elements;
-		}
-
-		/**
-		 * @generated
-		 */
-		public final Map<EObject, View> getElement2ViewMap() {
-			if (element2ViewMap == null) {
-				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) {
-						View view = (View) element;
-						if (view.getDiagram() == scope.getDiagram()) {
-							element2ViewMap.put(element, view); // take only those that part of our diagram
-						}
-					}
-				}
-
-				buildElement2ViewMap(scope, element2ViewMap, elementSet);
-			}
-			return element2ViewMap;
-		}
-
-		/**
-		 * @generated
-		 */
-		private static boolean buildElement2ViewMap(View parentView, Map<EObject, View> element2ViewMap,
-				Set<? extends EObject> elements) {
-			if (elements.size() == element2ViewMap.size()) {
-				return true;
-			}
-
-			if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement())
-					&& elements.contains(parentView.getElement())) {
-				element2ViewMap.put(parentView.getElement(), parentView);
-				if (elements.size() == element2ViewMap.size()) {
-					return true;
-				}
-			}
-			boolean complete = false;
-			for (Iterator<?> it = parentView.getChildren().iterator(); it.hasNext() && !complete;) {
-				complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements);
-			}
-			for (Iterator<?> it = parentView.getSourceEdges().iterator(); it.hasNext() && !complete;) {
-				complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements);
-			}
-			for (Iterator<?> it = parentView.getTargetEdges().iterator(); it.hasNext() && !complete;) {
-				complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements);
-			}
-			return complete;
-		}
-	} // LazyElement2ViewMap
-}
+/**

+ * 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.component.part;

+

+import java.io.IOException;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.commands.operations.OperationHistoryFactory;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.SubProgressMonitor;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.xmi.XMLResource;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;

+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;

+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

+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.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class UMLDiagramEditorUtil {

+

+	/**

+	 * @generated

+	 */

+	public static Map<?, ?> getSaveOptions() {

+		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;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static boolean openDiagram(Resource diagram) throws PartInitException {

+		String path = diagram.getURI().toPlatformString(true);

+		IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path));

+		if (workspaceResource instanceof IFile) {

+			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

+			return null != page.openEditor(new FileEditorInput((IFile) workspaceResource), UMLDiagramEditor.ID);

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void setCharset(IFile file) {

+		if (file == null) {

+			return;

+		}

+		try {

+			file.setCharset("UTF-8", new NullProgressMonitor()); //$NON-NLS-1$

+		} catch (CoreException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Unable to set charset for file " + file.getFullPath(), e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static String getUniqueFileName(IPath containerFullPath, String fileName, String extension) {

+		return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, fileName, extension,

+				DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE);

+	}

+

+	/**

+	 * Runs the wizard in a dialog.

+	 *

+	 * @generated

+	 */

+	public static void runWizard(Shell shell, Wizard wizard, String settingsKey) {

+		IDialogSettings pluginDialogSettings = UMLDiagramEditorPlugin.getInstance().getDialogSettings();

+		IDialogSettings wizardDialogSettings = pluginDialogSettings.getSection(settingsKey);

+		if (wizardDialogSettings == null) {

+			wizardDialogSettings = pluginDialogSettings.addNewSection(settingsKey);

+		}

+		wizard.setDialogSettings(wizardDialogSettings);

+		WizardDialog dialog = new WizardDialog(shell, wizard);

+		dialog.create();

+		dialog.getShell().setSize(Math.max(500, dialog.getShell().getSize().x), 500);

+		dialog.open();

+	}

+

+	/**

+	 * 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) {

+		TransactionalEditingDomain editingDomain = WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain();

+		progressMonitor.beginTask(Messages.UMLDiagramEditorUtil_CreateDiagramProgressTask, 3);

+		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) {

+			@Override

+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)

+					throws ExecutionException {

+				Package model = createInitialModel();

+				attachModelToResource(model, modelResource);

+

+				Diagram diagram = ViewService.createDiagram(model, ComponentDiagramEditPart.MODEL_ID,

+						UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				if (diagram != null) {

+					diagramResource.getContents().add(diagram);

+					diagram.setName(diagramName);

+					diagram.setElement(model);

+				}

+

+				try {

+					modelResource

+							.save(org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorUtil.getSaveOptions());

+					diagramResource

+							.save(org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorUtil.getSaveOptions());

+				} catch (IOException e) {

+

+					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+		try {

+			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$

+		}

+		setCharset(WorkspaceSynchronizer.getFile(modelResource));

+		setCharset(WorkspaceSynchronizer.getFile(diagramResource));

+		return diagramResource;

+	}

+

+	/**

+	* Create a new instance of domain element associated with canvas.

+	* <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	* @generated

+	*/

+	private static Package createInitialModel() {

+		return UMLFactory.eINSTANCE.createPackage();

+	}

+

+	/**

+	* Store model element in the resource.

+	* <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	* @generated

+	*/

+	private static void attachModelToResource(Package model, Resource resource) {

+		resource.getContents().add(model);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) {

+		diagramPart.getDiagramGraphicalViewer().deselectAll();

+

+		EditPart firstPrimary = null;

+		for (EditPart nextPart : editParts) {

+			diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart);

+			if (firstPrimary == null && nextPart instanceof IPrimaryEditPart) {

+				firstPrimary = nextPart;

+			}

+		}

+

+		if (!editParts.isEmpty()) {

+			diagramPart.getDiagramGraphicalViewer()

+					.reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0));

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private static int findElementsInDiagramByID(DiagramEditPart diagramPart, EObject element,

+			List<EditPart> editPartCollector) {

+		IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer) diagramPart.getViewer();

+		final int intialNumOfEditParts = editPartCollector.size();

+

+		if (element instanceof View) { // support notation element lookup

+			EditPart editPart = (EditPart) viewer.getEditPartRegistry().get(element);

+			if (editPart != null) {

+				editPartCollector.add(editPart);

+				return 1;

+			}

+		}

+

+		String elementID = EMFCoreUtil.getProxyID(element);

+		@SuppressWarnings("unchecked")

+		List<EditPart> associatedParts = viewer.findEditPartsForElement(elementID, IGraphicalEditPart.class);

+		// perform the possible hierarchy disjoint -> take the top-most parts only

+		for (EditPart nextPart : associatedParts) {

+			EditPart parentPart = nextPart.getParent();

+			while (parentPart != null && !associatedParts.contains(parentPart)) {

+				parentPart = parentPart.getParent();

+			}

+			if (parentPart == null) {

+				editPartCollector.add(nextPart);

+			}

+		}

+

+		if (intialNumOfEditParts == editPartCollector.size()) {

+			if (!associatedParts.isEmpty()) {

+				editPartCollector.add(associatedParts.get(0));

+			} else {

+				if (element.eContainer() != null) {

+					return findElementsInDiagramByID(diagramPart, element.eContainer(), editPartCollector);

+				}

+			}

+		}

+		return editPartCollector.size() - intialNumOfEditParts;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static View findView(DiagramEditPart diagramEditPart, EObject targetElement,

+			LazyElement2ViewMap lazyElement2ViewMap) {

+		boolean hasStructuralURI = false;

+		if (targetElement.eResource() instanceof XMLResource) {

+			hasStructuralURI = ((XMLResource) targetElement.eResource()).getID(targetElement) == null;

+		}

+

+		View view = null;

+		LinkedList<EditPart> editPartHolder = new LinkedList<EditPart>();

+		if (hasStructuralURI && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) {

+			view = lazyElement2ViewMap.getElement2ViewMap().get(targetElement);

+		} else if (findElementsInDiagramByID(diagramEditPart, targetElement, editPartHolder) > 0) {

+			EditPart editPart = editPartHolder.get(0);

+			view = editPart.getModel() instanceof View ? (View) editPart.getModel() : null;

+		}

+

+		return (view == null) ? diagramEditPart.getDiagramView() : view;

+	}

+

+	/**

+	 * XXX This is quite suspicious code (especially editPartTmpHolder) and likely to be removed soon

+	 *

+	 * @generated

+	 */

+	public static class LazyElement2ViewMap {

+

+		/**

+		 * @generated

+		 */

+		private Map<EObject, View> element2ViewMap;

+

+		/**

+		 * @generated

+		 */

+		private View scope;

+

+		/**

+		 * @generated

+		 */

+		private Set<? extends EObject> elementSet;

+

+		/**

+		 * @generated

+		 */

+		public LazyElement2ViewMap(View scope, Set<? extends EObject> elements) {

+			this.scope = scope;

+			this.elementSet = elements;

+		}

+

+		/**

+		 * @generated

+		 */

+		public final Map<EObject, View> getElement2ViewMap() {

+			if (element2ViewMap == null) {

+				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) {

+						View view = (View) element;

+						if (view.getDiagram() == scope.getDiagram()) {

+							element2ViewMap.put(element, view); // take only those that part of our diagram

+						}

+					}

+				}

+

+				buildElement2ViewMap(scope, element2ViewMap, elementSet);

+			}

+			return element2ViewMap;

+		}

+

+		/**

+		 * @generated

+		 */

+		private static boolean buildElement2ViewMap(View parentView, Map<EObject, View> element2ViewMap,

+				Set<? extends EObject> elements) {

+			if (elements.size() == element2ViewMap.size()) {

+				return true;

+			}

+

+			if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement())

+					&& elements.contains(parentView.getElement())) {

+				element2ViewMap.put(parentView.getElement(), parentView);

+				if (elements.size() == element2ViewMap.size()) {

+					return true;

+				}

+			}

+			boolean complete = false;

+			for (Iterator<?> it = parentView.getChildren().iterator(); it.hasNext() && !complete;) {

+				complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements);

+			}

+			for (Iterator<?> it = parentView.getSourceEdges().iterator(); it.hasNext() && !complete;) {

+				complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements);

+			}

+			for (Iterator<?> it = parentView.getTargetEdges().iterator(); it.hasNext() && !complete;) {

+				complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements);

+			}

+			return complete;

+		}

+	} // LazyElement2ViewMap

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java
index 0301e018c83..fcb163aa191 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java
@@ -1,3423 +1,3423 @@
-/**
- * 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.component.part;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
-import org.eclipse.papyrus.uml.diagram.common.part.ICustomDiagramUpdater;
-import org.eclipse.papyrus.uml.diagram.component.custom.parts.PropertyDiagramUpdater;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentCompositeCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentCompositeCompartmentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentCompositeCompartmentEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DefaultNamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelPackageableElementCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelPackageableElementCompartmentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackagePackageableElementCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackagePackageableElementCompartmentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.ComponentRealization;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Generalization;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.InterfaceRealization;
-import org.eclipse.uml2.uml.Manifestation;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.PackageableElement;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Reception;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.Substitution;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.Usage;
-
-/**
- * @generated
- */
-public class UMLDiagramUpdater implements DiagramUpdater {
-
-	/**
-	 * @generated
-	 */
-	public static final org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater INSTANCE = new UMLDiagramUpdater();
-
-	/**
-	 * @generated
-	 */
-	protected UMLDiagramUpdater() {
-		// to prevent instantiation allowing the override
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public List<UMLNodeDescriptor> getSemanticChildren(View view) {
-		String vid = UMLVisualIDRegistry.getVisualID(view);
-		if (vid != null) {
-			switch (vid) {
-			case ComponentDiagramEditPart.VISUAL_ID:
-				return getPackage_ComponentDiagram_SemanticChildren(view);
-			case ComponentEditPart.VISUAL_ID:
-				return getComponent_PackagedElementShape_SemanticChildren(view);
-			case ComponentEditPartCN.VISUAL_ID:
-				return getComponent_PackagedElementShape_CCN_SemanticChildren(view);
-			case ComponentEditPartPCN.VISUAL_ID:
-				return getComponent_PackagedElementShape_CN_SemanticChildren(view);
-			case PropertyPartEditPartCN.VISUAL_ID:
-				return getProperty_Shape_SemanticChildren(view);
-			case ComponentCompositeCompartmentEditPart.VISUAL_ID:
-				return getComponent_StructureCompartment_SemanticChildren(view);
-			case ModelPackageableElementCompartmentEditPart.VISUAL_ID:
-				return getModel_PackagedElementCompartment_SemanticChildren(view);
-			case PackagePackageableElementCompartmentEditPart.VISUAL_ID:
-				return getPackage_PackagedElementCompartment_SemanticChildren(view);
-			case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID:
-				return getModel_PackagedElementCompartment_CN_SemanticChildren(view);
-			case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID:
-				return getPackage_PackagedElementCompartment_CN_SemanticChildren(view);
-			case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:
-				return getComponent_StructureCompartment_CCN_SemanticChildren(view);
-			case ComponentCompositeCompartmentEditPartPCN.VISUAL_ID:
-				return getComponent_StructureCompartment_CN_SemanticChildren(view);
-			case InterfaceAttributeCompartmentEditPart.VISUAL_ID:
-				return getInterface_AttributeCompartment_SemanticChildren(view);
-			case InterfaceOperationCompartmentEditPart.VISUAL_ID:
-				return getInterface_OperationCompartment_SemanticChildren(view);
-			case InterfaceAttributeCompartmentEditPartCN.VISUAL_ID:
-				return getInterface_AttributeCompartment_CN_SemanticChildren(view);
-			case InterfaceOperationCompartmentEditPartCN.VISUAL_ID:
-				return getInterface_OperationCompartment_CN_SemanticChildren(view);
-			}
-		}
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getPackage_ComponentDiagram_SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Package modelElement = (Package) view.getElement();
-		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)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (ModelEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (PackageEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (RectangleInterfaceEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedTypes().iterator(); it.hasNext();) {
-			Type childElement = (Type) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (ComponentEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (InterfaceEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (CommentEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (ConstraintEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		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)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getComponent_PackagedElementShape_SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (PortEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getComponent_PackagedElementShape_CCN_SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (PortEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getComponent_PackagedElementShape_CN_SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (PortEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getProperty_Shape_SemanticChildren(View view) {
-		ICustomDiagramUpdater<UMLNodeDescriptor> customUpdater = new PropertyDiagramUpdater();
-		return customUpdater.getSemanticChildren(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getComponent_StructureCompartment_SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Component modelElement = (Component) containerView.getElement();
-		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 (ComponentEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getModel_PackagedElementCompartment_SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Model modelElement = (Model) containerView.getElement();
-		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 (RectangleInterfaceEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (ModelEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (PackageEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (ComponentEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (InterfaceEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (CommentEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (ConstraintEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getPackage_PackagedElementCompartment_SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Package modelElement = (Package) containerView.getElement();
-		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 (RectangleInterfaceEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (ComponentEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (ModelEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (PackageEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (InterfaceEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (CommentEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (ConstraintEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getModel_PackagedElementCompartment_CN_SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Model modelElement = (Model) containerView.getElement();
-		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 (RectangleInterfaceEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (ModelEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (PackageEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (ComponentEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (InterfaceEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (CommentEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (ConstraintEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getPackage_PackagedElementCompartment_CN_SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Package modelElement = (Package) containerView.getElement();
-		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 (RectangleInterfaceEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (ModelEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (PackageEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (ComponentEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (InterfaceEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (CommentEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (ConstraintEditPartPCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getComponent_StructureCompartment_CCN_SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Component modelElement = (Component) containerView.getElement();
-		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 (ComponentEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getComponent_StructureCompartment_CN_SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Component modelElement = (Component) containerView.getElement();
-		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 (ComponentEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getInterface_AttributeCompartment_SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Interface modelElement = (Interface) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (PropertyForInterfaceEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getInterface_OperationCompartment_SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Interface modelElement = (Interface) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) {
-			Operation childElement = (Operation) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (OperationForInterfaceEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) {
-			Reception childElement = (Reception) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (ReceptionInInterfaceEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getInterface_AttributeCompartment_CN_SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Interface modelElement = (Interface) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (PropertyForInterfaceEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLNodeDescriptor> getInterface_OperationCompartment_CN_SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Interface modelElement = (Interface) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) {
-			Operation childElement = (Operation) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (OperationForInterfaceEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) {
-			Reception childElement = (Reception) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (ReceptionInInterfaceEditPart.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public List<UMLLinkDescriptor> getContainedLinks(View view) {
-		String vid = UMLVisualIDRegistry.getVisualID(view);
-		if (vid != null) {
-			switch (vid) {
-			case ComponentDiagramEditPart.VISUAL_ID:
-				return getPackage_ComponentDiagram_ContainedLinks(view);
-			case DependencyNodeEditPart.VISUAL_ID:
-				return getDependency_Shape_ContainedLinks(view);
-			case ComponentEditPart.VISUAL_ID:
-				return getComponent_PackagedElementShape_ContainedLinks(view);
-			case ModelEditPart.VISUAL_ID:
-				return getModel_Shape_ContainedLinks(view);
-			case PackageEditPart.VISUAL_ID:
-				return getPackage_Shape_ContainedLinks(view);
-			case RectangleInterfaceEditPart.VISUAL_ID:
-				return getInterface_ClassifierShape_ContainedLinks(view);
-			case CommentEditPart.VISUAL_ID:
-				return getComment_Shape_ContainedLinks(view);
-			case ConstraintEditPart.VISUAL_ID:
-				return getConstraint_Shape_ContainedLinks(view);
-			case DefaultNamedElementEditPart.VISUAL_ID:
-				return getNamedElement_DefaultShape_ContainedLinks(view);
-			case InterfaceEditPart.VISUAL_ID:
-				return getInterface_Shape_ContainedLinks(view);
-			case PortEditPart.VISUAL_ID:
-				return getPort_Shape_ContainedLinks(view);
-			case ModelEditPartCN.VISUAL_ID:
-				return getModel_Shape_CN_ContainedLinks(view);
-			case PackageEditPartCN.VISUAL_ID:
-				return getPackage_Shape_CN_ContainedLinks(view);
-			case RectangleInterfaceEditPartCN.VISUAL_ID:
-				return getInterface_ClassifierShape_CN_ContainedLinks(view);
-			case ComponentEditPartCN.VISUAL_ID:
-				return getComponent_PackagedElementShape_CCN_ContainedLinks(view);
-			case ComponentEditPartPCN.VISUAL_ID:
-				return getComponent_PackagedElementShape_CN_ContainedLinks(view);
-			case CommentEditPartPCN.VISUAL_ID:
-				return getComment_Shape_CN_ContainedLinks(view);
-			case ConstraintEditPartPCN.VISUAL_ID:
-				return getConstraint_Shape_CN_ContainedLinks(view);
-			case PropertyForInterfaceEditPart.VISUAL_ID:
-				return getProperty_InterfaceAttributeLabel_ContainedLinks(view);
-			case OperationForInterfaceEditPart.VISUAL_ID:
-				return getOperation_InterfaceOperationLabel_ContainedLinks(view);
-			case ReceptionInInterfaceEditPart.VISUAL_ID:
-				return getReception_InterfaceReceptionLabel_ContainedLinks(view);
-			case InterfaceEditPartPCN.VISUAL_ID:
-				return getInterface_Shape_CN_ContainedLinks(view);
-			case PropertyPartEditPartCN.VISUAL_ID:
-				return getProperty_Shape_ContainedLinks(view);
-			case UsageEditPart.VISUAL_ID:
-				return getUsage_Edge_ContainedLinks(view);
-			case InterfaceRealizationEditPart.VISUAL_ID:
-				return getInterfaceRealization_Edge_ContainedLinks(view);
-			case GeneralizationEditPart.VISUAL_ID:
-				return getGeneralization_Edge_ContainedLinks(view);
-			case SubstitutionEditPart.VISUAL_ID:
-				return getSubstitution_Edge_ContainedLinks(view);
-			case ManifestationEditPart.VISUAL_ID:
-				return getManifestation_Edge_ContainedLinks(view);
-			case ComponentRealizationEditPart.VISUAL_ID:
-				return getComponentRealization_Edge_ContainedLinks(view);
-			case AbstractionEditPart.VISUAL_ID:
-				return getAbstraction_Edge_ContainedLinks(view);
-			case DependencyEditPart.VISUAL_ID:
-				return getDependency_Edge_ContainedLinks(view);
-			case DependencyBranchEditPart.VISUAL_ID:
-				return getDependency_BranchEdge_ContainedLinks(view);
-			case ConnectorEditPart.VISUAL_ID:
-				return getConnector_Edge_ContainedLinks(view);
-			}
-		}
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public List<UMLLinkDescriptor> getIncomingLinks(View view) {
-		String vid = UMLVisualIDRegistry.getVisualID(view);
-		if (vid != null) {
-			switch (vid) {
-			case DependencyNodeEditPart.VISUAL_ID:
-				return getDependency_Shape_IncomingLinks(view);
-			case ComponentEditPart.VISUAL_ID:
-				return getComponent_PackagedElementShape_IncomingLinks(view);
-			case ModelEditPart.VISUAL_ID:
-				return getModel_Shape_IncomingLinks(view);
-			case PackageEditPart.VISUAL_ID:
-				return getPackage_Shape_IncomingLinks(view);
-			case RectangleInterfaceEditPart.VISUAL_ID:
-				return getInterface_ClassifierShape_IncomingLinks(view);
-			case CommentEditPart.VISUAL_ID:
-				return getComment_Shape_IncomingLinks(view);
-			case ConstraintEditPart.VISUAL_ID:
-				return getConstraint_Shape_IncomingLinks(view);
-			case DefaultNamedElementEditPart.VISUAL_ID:
-				return getNamedElement_DefaultShape_IncomingLinks(view);
-			case InterfaceEditPart.VISUAL_ID:
-				return getInterface_Shape_IncomingLinks(view);
-			case PortEditPart.VISUAL_ID:
-				return getPort_Shape_IncomingLinks(view);
-			case ModelEditPartCN.VISUAL_ID:
-				return getModel_Shape_CN_IncomingLinks(view);
-			case PackageEditPartCN.VISUAL_ID:
-				return getPackage_Shape_CN_IncomingLinks(view);
-			case RectangleInterfaceEditPartCN.VISUAL_ID:
-				return getInterface_ClassifierShape_CN_IncomingLinks(view);
-			case ComponentEditPartCN.VISUAL_ID:
-				return getComponent_PackagedElementShape_CCN_IncomingLinks(view);
-			case ComponentEditPartPCN.VISUAL_ID:
-				return getComponent_PackagedElementShape_CN_IncomingLinks(view);
-			case CommentEditPartPCN.VISUAL_ID:
-				return getComment_Shape_CN_IncomingLinks(view);
-			case ConstraintEditPartPCN.VISUAL_ID:
-				return getConstraint_Shape_CN_IncomingLinks(view);
-			case PropertyForInterfaceEditPart.VISUAL_ID:
-				return getProperty_InterfaceAttributeLabel_IncomingLinks(view);
-			case OperationForInterfaceEditPart.VISUAL_ID:
-				return getOperation_InterfaceOperationLabel_IncomingLinks(view);
-			case ReceptionInInterfaceEditPart.VISUAL_ID:
-				return getReception_InterfaceReceptionLabel_IncomingLinks(view);
-			case InterfaceEditPartPCN.VISUAL_ID:
-				return getInterface_Shape_CN_IncomingLinks(view);
-			case PropertyPartEditPartCN.VISUAL_ID:
-				return getProperty_Shape_IncomingLinks(view);
-			case UsageEditPart.VISUAL_ID:
-				return getUsage_Edge_IncomingLinks(view);
-			case InterfaceRealizationEditPart.VISUAL_ID:
-				return getInterfaceRealization_Edge_IncomingLinks(view);
-			case GeneralizationEditPart.VISUAL_ID:
-				return getGeneralization_Edge_IncomingLinks(view);
-			case SubstitutionEditPart.VISUAL_ID:
-				return getSubstitution_Edge_IncomingLinks(view);
-			case ManifestationEditPart.VISUAL_ID:
-				return getManifestation_Edge_IncomingLinks(view);
-			case ComponentRealizationEditPart.VISUAL_ID:
-				return getComponentRealization_Edge_IncomingLinks(view);
-			case AbstractionEditPart.VISUAL_ID:
-				return getAbstraction_Edge_IncomingLinks(view);
-			case DependencyEditPart.VISUAL_ID:
-				return getDependency_Edge_IncomingLinks(view);
-			case DependencyBranchEditPart.VISUAL_ID:
-				return getDependency_BranchEdge_IncomingLinks(view);
-			case ConnectorEditPart.VISUAL_ID:
-				return getConnector_Edge_IncomingLinks(view);
-			}
-		}
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public List<UMLLinkDescriptor> getOutgoingLinks(View view) {
-		String vid = UMLVisualIDRegistry.getVisualID(view);
-		if (vid != null) {
-			switch (vid) {
-			case DependencyNodeEditPart.VISUAL_ID:
-				return getDependency_Shape_OutgoingLinks(view);
-			case ComponentEditPart.VISUAL_ID:
-				return getComponent_PackagedElementShape_OutgoingLinks(view);
-			case ModelEditPart.VISUAL_ID:
-				return getModel_Shape_OutgoingLinks(view);
-			case PackageEditPart.VISUAL_ID:
-				return getPackage_Shape_OutgoingLinks(view);
-			case RectangleInterfaceEditPart.VISUAL_ID:
-				return getInterface_ClassifierShape_OutgoingLinks(view);
-			case CommentEditPart.VISUAL_ID:
-				return getComment_Shape_OutgoingLinks(view);
-			case ConstraintEditPart.VISUAL_ID:
-				return getConstraint_Shape_OutgoingLinks(view);
-			case DefaultNamedElementEditPart.VISUAL_ID:
-				return getNamedElement_DefaultShape_OutgoingLinks(view);
-			case InterfaceEditPart.VISUAL_ID:
-				return getInterface_Shape_OutgoingLinks(view);
-			case PortEditPart.VISUAL_ID:
-				return getPort_Shape_OutgoingLinks(view);
-			case ModelEditPartCN.VISUAL_ID:
-				return getModel_Shape_CN_OutgoingLinks(view);
-			case PackageEditPartCN.VISUAL_ID:
-				return getPackage_Shape_CN_OutgoingLinks(view);
-			case RectangleInterfaceEditPartCN.VISUAL_ID:
-				return getInterface_ClassifierShape_CN_OutgoingLinks(view);
-			case ComponentEditPartCN.VISUAL_ID:
-				return getComponent_PackagedElementShape_CCN_OutgoingLinks(view);
-			case ComponentEditPartPCN.VISUAL_ID:
-				return getComponent_PackagedElementShape_CN_OutgoingLinks(view);
-			case CommentEditPartPCN.VISUAL_ID:
-				return getComment_Shape_CN_OutgoingLinks(view);
-			case ConstraintEditPartPCN.VISUAL_ID:
-				return getConstraint_Shape_CN_OutgoingLinks(view);
-			case PropertyForInterfaceEditPart.VISUAL_ID:
-				return getProperty_InterfaceAttributeLabel_OutgoingLinks(view);
-			case OperationForInterfaceEditPart.VISUAL_ID:
-				return getOperation_InterfaceOperationLabel_OutgoingLinks(view);
-			case ReceptionInInterfaceEditPart.VISUAL_ID:
-				return getReception_InterfaceReceptionLabel_OutgoingLinks(view);
-			case InterfaceEditPartPCN.VISUAL_ID:
-				return getInterface_Shape_CN_OutgoingLinks(view);
-			case PropertyPartEditPartCN.VISUAL_ID:
-				return getProperty_Shape_OutgoingLinks(view);
-			case UsageEditPart.VISUAL_ID:
-				return getUsage_Edge_OutgoingLinks(view);
-			case InterfaceRealizationEditPart.VISUAL_ID:
-				return getInterfaceRealization_Edge_OutgoingLinks(view);
-			case GeneralizationEditPart.VISUAL_ID:
-				return getGeneralization_Edge_OutgoingLinks(view);
-			case SubstitutionEditPart.VISUAL_ID:
-				return getSubstitution_Edge_OutgoingLinks(view);
-			case ManifestationEditPart.VISUAL_ID:
-				return getManifestation_Edge_OutgoingLinks(view);
-			case ComponentRealizationEditPart.VISUAL_ID:
-				return getComponentRealization_Edge_OutgoingLinks(view);
-			case AbstractionEditPart.VISUAL_ID:
-				return getAbstraction_Edge_OutgoingLinks(view);
-			case DependencyEditPart.VISUAL_ID:
-				return getDependency_Edge_OutgoingLinks(view);
-			case DependencyBranchEditPart.VISUAL_ID:
-				return getDependency_BranchEdge_OutgoingLinks(view);
-			case ConnectorEditPart.VISUAL_ID:
-				return getConnector_Edge_OutgoingLinks(view);
-			}
-		}
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getPackage_ComponentDiagram_ContainedLinks(View view) {
-		Package modelElement = (Package) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getDependency_Shape_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_ContainedLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Connector_Edge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getModel_Shape_ContainedLinks(View view) {
-		Model modelElement = (Model) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getPackage_Shape_ContainedLinks(View view) {
-		Package modelElement = (Package) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterface_ClassifierShape_ContainedLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComment_Shape_ContainedLinks(View view) {
-		Comment modelElement = (Comment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getConstraint_Shape_ContainedLinks(View view) {
-		Constraint modelElement = (Constraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getNamedElement_DefaultShape_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterface_Shape_ContainedLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getPort_Shape_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getModel_Shape_CN_ContainedLinks(View view) {
-		Model modelElement = (Model) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getPackage_Shape_CN_ContainedLinks(View view) {
-		Package modelElement = (Package) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterface_ClassifierShape_CN_ContainedLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_CCN_ContainedLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Connector_Edge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_CN_ContainedLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Connector_Edge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComment_Shape_CN_ContainedLinks(View view) {
-		Comment modelElement = (Comment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getConstraint_Shape_CN_ContainedLinks(View view) {
-		Constraint modelElement = (Constraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getProperty_InterfaceAttributeLabel_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getOperation_InterfaceOperationLabel_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getReception_InterfaceReceptionLabel_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterface_Shape_CN_ContainedLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getProperty_Shape_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getUsage_Edge_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterfaceRealization_Edge_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getGeneralization_Edge_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getSubstitution_Edge_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getManifestation_Edge_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComponentRealization_Edge_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getAbstraction_Edge_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getDependency_Edge_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getDependency_BranchEdge_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getConnector_Edge_ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_IncomingLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterface_ClassifierShape_IncomingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterface_Shape_IncomingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getPort_Shape_IncomingLinks(View view) {
-		Port modelElement = (Port) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterface_ClassifierShape_CN_IncomingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_CCN_IncomingLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_CN_IncomingLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getProperty_InterfaceAttributeLabel_IncomingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getOperation_InterfaceOperationLabel_IncomingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getReception_InterfaceReceptionLabel_IncomingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterface_Shape_CN_IncomingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getProperty_Shape_IncomingLinks(View view) {
-		Property modelElement = (Property) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getUsage_Edge_IncomingLinks(View view) {
-		Usage modelElement = (Usage) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterfaceRealization_Edge_IncomingLinks(View view) {
-		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getSubstitution_Edge_IncomingLinks(View view) {
-		Substitution modelElement = (Substitution) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComponentRealization_Edge_IncomingLinks(View view) {
-		ComponentRealization modelElement = (ComponentRealization) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getAbstraction_Edge_IncomingLinks(View view) {
-		Abstraction modelElement = (Abstraction) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	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<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getConnector_Edge_IncomingLinks(View view) {
-		Connector modelElement = (Connector) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(
-				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getDependency_Shape_OutgoingLinks(View view) {
-		Dependency modelElement = (Dependency) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_OutgoingLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getModel_Shape_OutgoingLinks(View view) {
-		Model modelElement = (Model) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getPackage_Shape_OutgoingLinks(View view) {
-		Package modelElement = (Package) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterface_ClassifierShape_OutgoingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComment_Shape_OutgoingLinks(View view) {
-		Comment modelElement = (Comment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getConstraint_Shape_OutgoingLinks(View view) {
-		Constraint modelElement = (Constraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getNamedElement_DefaultShape_OutgoingLinks(View view) {
-		NamedElement modelElement = (NamedElement) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterface_Shape_OutgoingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getPort_Shape_OutgoingLinks(View view) {
-		Port modelElement = (Port) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getModel_Shape_CN_OutgoingLinks(View view) {
-		Model modelElement = (Model) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getPackage_Shape_CN_OutgoingLinks(View view) {
-		Package modelElement = (Package) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterface_ClassifierShape_CN_OutgoingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_CCN_OutgoingLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_CN_OutgoingLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComment_Shape_CN_OutgoingLinks(View view) {
-		Comment modelElement = (Comment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getConstraint_Shape_CN_OutgoingLinks(View view) {
-		Constraint modelElement = (Constraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getProperty_InterfaceAttributeLabel_OutgoingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getOperation_InterfaceOperationLabel_OutgoingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getReception_InterfaceReceptionLabel_OutgoingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterface_Shape_CN_OutgoingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getProperty_Shape_OutgoingLinks(View view) {
-		Property modelElement = (Property) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getUsage_Edge_OutgoingLinks(View view) {
-		Usage modelElement = (Usage) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getInterfaceRealization_Edge_OutgoingLinks(View view) {
-		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getGeneralization_Edge_OutgoingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getSubstitution_Edge_OutgoingLinks(View view) {
-		Substitution modelElement = (Substitution) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getManifestation_Edge_OutgoingLinks(View view) {
-		Manifestation modelElement = (Manifestation) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getComponentRealization_Edge_OutgoingLinks(View view) {
-		ComponentRealization modelElement = (ComponentRealization) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getAbstraction_Edge_OutgoingLinks(View view) {
-		Abstraction modelElement = (Abstraction) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getDependency_Edge_OutgoingLinks(View view) {
-		Dependency modelElement = (Dependency) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getDependency_BranchEdge_OutgoingLinks(View view) {
-		Dependency modelElement = (Dependency) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List<UMLLinkDescriptor> getConnector_Edge_OutgoingLinks(View view) {
-		Connector modelElement = (Connector) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Usage_Edge(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Usage) {
-				continue;
-			}
-			Usage link = (Usage) linkObject;
-			if (!UsageEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_Edge, UsageEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_Edge(
-			Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof InterfaceRealization) {
-				continue;
-			}
-			InterfaceRealization link = (InterfaceRealization) linkObject;
-			if (!InterfaceRealizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			Interface dst = link.getContract();
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_Edge,
-					InterfaceRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_Edge(Classifier container) {
-		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;
-			}
-			Generalization link = (Generalization) linkObject;
-			if (!GeneralizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			Classifier dst = link.getGeneral();
-			Classifier src = link.getSpecific();
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_Edge,
-					GeneralizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Substitution_Edge(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Substitution) {
-				continue;
-			}
-			Substitution link = (Substitution) linkObject;
-			if (!SubstitutionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_Edge,
-					SubstitutionEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Manifestation_Edge(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Manifestation) {
-				continue;
-			}
-			Manifestation link = (Manifestation) linkObject;
-			if (!ManifestationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_Edge,
-					ManifestationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ComponentRealization_Edge(
-			Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof ComponentRealization) {
-				continue;
-			}
-			ComponentRealization link = (ComponentRealization) linkObject;
-			if (!ComponentRealizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_Edge,
-					ComponentRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Abstraction_Edge(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Abstraction) {
-				continue;
-			}
-			Abstraction link = (Abstraction) linkObject;
-			if (!AbstractionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_Edge,
-					AbstractionEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_Edge(Package container) {
-		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;
-			}
-			Dependency link = (Dependency) linkObject;
-			if (!DependencyEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge,
-					DependencyEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_BranchEdge(Package container) {
-		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;
-			}
-			Dependency link = (Dependency) linkObject;
-			if (!DependencyBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge,
-					DependencyBranchEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Connector_Edge(
-			StructuredClassifier container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getOwnedConnectors().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Connector) {
-				continue;
-			}
-			Connector link = (Connector) linkObject;
-			if (!ConnectorEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getEnds();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof ConnectorEnd) {
-				continue;
-			}
-			ConnectorEnd dst = (ConnectorEnd) theTarget;
-			List<?> sources = link.getEnds();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof ConnectorEnd) {
-				continue;
-			}
-			ConnectorEnd src = (ConnectorEnd) theSource;
-			result.add(
-					new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Connector_Edge, ConnectorEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_Edge(NamedElement target,
-			CrossReferenceAdapter crossReferencer) {
-		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 Usage) {
-				continue;
-			}
-			Usage link = (Usage) setting.getEObject();
-			if (!UsageEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Usage_Edge, UsageEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(Interface target,
-			CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInterfaceRealization_Contract()
-					|| false == setting.getEObject() instanceof InterfaceRealization) {
-				continue;
-			}
-			InterfaceRealization link = (InterfaceRealization) setting.getEObject();
-			if (!InterfaceRealizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InterfaceRealization_Edge,
-					InterfaceRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_Edge(Classifier target,
-			CrossReferenceAdapter crossReferencer) {
-		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) {
-				continue;
-			}
-			Generalization link = (Generalization) setting.getEObject();
-			if (!GeneralizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			Classifier src = link.getSpecific();
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Generalization_Edge,
-					GeneralizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Substitution_Edge(NamedElement target,
-			CrossReferenceAdapter crossReferencer) {
-		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 Substitution) {
-				continue;
-			}
-			Substitution link = (Substitution) setting.getEObject();
-			if (!SubstitutionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Substitution_Edge,
-					SubstitutionEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Manifestation_Edge(NamedElement target,
-			CrossReferenceAdapter crossReferencer) {
-		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) {
-				continue;
-			}
-			Manifestation link = (Manifestation) setting.getEObject();
-			if (!ManifestationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Manifestation_Edge,
-					ManifestationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ComponentRealization_Edge(
-			NamedElement target, CrossReferenceAdapter crossReferencer) {
-		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 ComponentRealization) {
-				continue;
-			}
-			ComponentRealization link = (ComponentRealization) setting.getEObject();
-			if (!ComponentRealizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.ComponentRealization_Edge,
-					ComponentRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Abstraction_Edge(NamedElement target,
-			CrossReferenceAdapter crossReferencer) {
-		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 Abstraction) {
-				continue;
-			}
-			Abstraction link = (Abstraction) setting.getEObject();
-			if (!AbstractionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Abstraction_Edge,
-					AbstractionEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(
-			Element target, CrossReferenceAdapter crossReferencer) {
-		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));
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(
-			Element target, CrossReferenceAdapter crossReferencer) {
-		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));
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_Edge(NamedElement target,
-			CrossReferenceAdapter crossReferencer) {
-		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) {
-				continue;
-			}
-			Dependency link = (Dependency) setting.getEObject();
-			if (!DependencyEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_Edge,
-					DependencyEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_BranchEdge(NamedElement target,
-			CrossReferenceAdapter crossReferencer) {
-		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) {
-				continue;
-			}
-			Dependency link = (Dependency) setting.getEObject();
-			if (!DependencyBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_BranchEdge,
-					DependencyBranchEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Usage_Edge(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Usage) {
-				continue;
-			}
-			Usage link = (Usage) linkObject;
-			if (!UsageEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_Edge, UsageEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(
-			NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof InterfaceRealization) {
-				continue;
-			}
-			InterfaceRealization link = (InterfaceRealization) linkObject;
-			if (!InterfaceRealizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			Interface dst = link.getContract();
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_Edge,
-					InterfaceRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Generalization_Edge(Classifier source) {
-		Classifier container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Classifier) {
-				container = (Classifier) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		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;
-			}
-			Generalization link = (Generalization) linkObject;
-			if (!GeneralizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			Classifier dst = link.getGeneral();
-			Classifier src = link.getSpecific();
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_Edge,
-					GeneralizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Substitution_Edge(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Substitution) {
-				continue;
-			}
-			Substitution link = (Substitution) linkObject;
-			if (!SubstitutionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_Edge,
-					SubstitutionEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Manifestation_Edge(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Manifestation) {
-				continue;
-			}
-			Manifestation link = (Manifestation) linkObject;
-			if (!ManifestationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_Edge,
-					ManifestationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(
-			NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof ComponentRealization) {
-				continue;
-			}
-			ComponentRealization link = (ComponentRealization) linkObject;
-			if (!ComponentRealizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_Edge,
-					ComponentRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Abstraction_Edge(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Abstraction) {
-				continue;
-			}
-			Abstraction link = (Abstraction) linkObject;
-			if (!AbstractionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_Edge,
-					AbstractionEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(
-			Comment source) {
-		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));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(
-			Constraint source) {
-		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));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_Edge(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		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;
-			}
-			Dependency link = (Dependency) linkObject;
-			if (!DependencyEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge,
-					DependencyEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		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;
-			}
-			Dependency link = (Dependency) linkObject;
-			if (!DependencyBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge,
-					DependencyBranchEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.component.part;

+

+import java.util.Collection;

+import java.util.Collections;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.common.part.ICustomDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.component.custom.parts.PropertyDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentCompositeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentCompositeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentCompositeCompartmentEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DefaultNamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelPackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelPackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackagePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.uml2.uml.Abstraction;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.ComponentRealization;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.ConnectorEnd;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.Generalization;

+import org.eclipse.uml2.uml.Interface;

+import org.eclipse.uml2.uml.InterfaceRealization;

+import org.eclipse.uml2.uml.Manifestation;

+import org.eclipse.uml2.uml.Model;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Operation;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.PackageableElement;

+import org.eclipse.uml2.uml.Port;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.Reception;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.Substitution;

+import org.eclipse.uml2.uml.Type;

+import org.eclipse.uml2.uml.UMLPackage;

+import org.eclipse.uml2.uml.Usage;

+

+/**

+ * @generated

+ */

+public class UMLDiagramUpdater implements DiagramUpdater {

+

+	/**

+	 * @generated

+	 */

+	public static final org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater INSTANCE = new UMLDiagramUpdater();

+

+	/**

+	 * @generated

+	 */

+	protected UMLDiagramUpdater() {

+		//to prevent instantiation allowing the override

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public List<UMLNodeDescriptor> getSemanticChildren(View view) {

+		String vid = UMLVisualIDRegistry.getVisualID(view);

+		if (vid != null) {

+			switch (vid) {

+			case ComponentDiagramEditPart.VISUAL_ID:

+				return getPackage_ComponentDiagram_SemanticChildren(view);

+			case ComponentEditPart.VISUAL_ID:

+				return getComponent_PackagedElementShape_SemanticChildren(view);

+			case ComponentEditPartCN.VISUAL_ID:

+				return getComponent_PackagedElementShape_CCN_SemanticChildren(view);

+			case ComponentEditPartPCN.VISUAL_ID:

+				return getComponent_PackagedElementShape_CN_SemanticChildren(view);

+			case PropertyPartEditPartCN.VISUAL_ID:

+				return getProperty_Shape_SemanticChildren(view);

+			case ComponentCompositeCompartmentEditPart.VISUAL_ID:

+				return getComponent_StructureCompartment_SemanticChildren(view);

+			case ModelPackageableElementCompartmentEditPart.VISUAL_ID:

+				return getModel_PackagedElementCompartment_SemanticChildren(view);

+			case PackagePackageableElementCompartmentEditPart.VISUAL_ID:

+				return getPackage_PackagedElementCompartment_SemanticChildren(view);

+			case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID:

+				return getModel_PackagedElementCompartment_CN_SemanticChildren(view);

+			case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID:

+				return getPackage_PackagedElementCompartment_CN_SemanticChildren(view);

+			case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

+				return getComponent_StructureCompartment_CCN_SemanticChildren(view);

+			case ComponentCompositeCompartmentEditPartPCN.VISUAL_ID:

+				return getComponent_StructureCompartment_CN_SemanticChildren(view);

+			case InterfaceAttributeCompartmentEditPart.VISUAL_ID:

+				return getInterface_AttributeCompartment_SemanticChildren(view);

+			case InterfaceOperationCompartmentEditPart.VISUAL_ID:

+				return getInterface_OperationCompartment_SemanticChildren(view);

+			case InterfaceAttributeCompartmentEditPartCN.VISUAL_ID:

+				return getInterface_AttributeCompartment_CN_SemanticChildren(view);

+			case InterfaceOperationCompartmentEditPartCN.VISUAL_ID:

+				return getInterface_OperationCompartment_CN_SemanticChildren(view);

+			}

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getPackage_ComponentDiagram_SemanticChildren(View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Package modelElement = (Package) view.getElement();

+		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)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (ModelEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (PackageEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (RectangleInterfaceEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedTypes().iterator(); it.hasNext();) {

+			Type childElement = (Type) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (ComponentEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (InterfaceEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (CommentEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (ConstraintEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		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)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getComponent_PackagedElementShape_SemanticChildren(View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Component modelElement = (Component) view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (PortEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getComponent_PackagedElementShape_CCN_SemanticChildren(View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Component modelElement = (Component) view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (PortEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getComponent_PackagedElementShape_CN_SemanticChildren(View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Component modelElement = (Component) view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (PortEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getProperty_Shape_SemanticChildren(View view) {

+		ICustomDiagramUpdater<UMLNodeDescriptor> customUpdater = new PropertyDiagramUpdater();

+		return customUpdater.getSemanticChildren(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getComponent_StructureCompartment_SemanticChildren(View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Component modelElement = (Component) containerView.getElement();

+		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 (ComponentEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getModel_PackagedElementCompartment_SemanticChildren(View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Model modelElement = (Model) containerView.getElement();

+		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 (RectangleInterfaceEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (ModelEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (PackageEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (ComponentEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (InterfaceEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (CommentEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (ConstraintEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getPackage_PackagedElementCompartment_SemanticChildren(View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Package modelElement = (Package) containerView.getElement();

+		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 (RectangleInterfaceEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (ComponentEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (ModelEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (PackageEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (InterfaceEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (CommentEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (ConstraintEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getModel_PackagedElementCompartment_CN_SemanticChildren(View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Model modelElement = (Model) containerView.getElement();

+		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 (RectangleInterfaceEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (ModelEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (PackageEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (ComponentEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (InterfaceEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (CommentEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (ConstraintEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getPackage_PackagedElementCompartment_CN_SemanticChildren(View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Package modelElement = (Package) containerView.getElement();

+		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 (RectangleInterfaceEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (ModelEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (PackageEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (ComponentEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (InterfaceEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (CommentEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (ConstraintEditPartPCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getComponent_StructureCompartment_CCN_SemanticChildren(View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Component modelElement = (Component) containerView.getElement();

+		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 (ComponentEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getComponent_StructureCompartment_CN_SemanticChildren(View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Component modelElement = (Component) containerView.getElement();

+		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 (ComponentEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getInterface_AttributeCompartment_SemanticChildren(View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Interface modelElement = (Interface) containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (PropertyForInterfaceEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getInterface_OperationCompartment_SemanticChildren(View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Interface modelElement = (Interface) containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) {

+			Operation childElement = (Operation) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (OperationForInterfaceEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) {

+			Reception childElement = (Reception) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (ReceptionInInterfaceEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getInterface_AttributeCompartment_CN_SemanticChildren(View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Interface modelElement = (Interface) containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (PropertyForInterfaceEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getInterface_OperationCompartment_CN_SemanticChildren(View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Interface modelElement = (Interface) containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) {

+			Operation childElement = (Operation) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (OperationForInterfaceEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) {

+			Reception childElement = (Reception) it.next();

+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if (ReceptionInInterfaceEditPart.VISUAL_ID.equals(visualID)) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public List<UMLLinkDescriptor> getContainedLinks(View view) {

+		String vid = UMLVisualIDRegistry.getVisualID(view);

+		if (vid != null) {

+			switch (vid) {

+			case ComponentDiagramEditPart.VISUAL_ID:

+				return getPackage_ComponentDiagram_ContainedLinks(view);

+			case DependencyNodeEditPart.VISUAL_ID:

+				return getDependency_Shape_ContainedLinks(view);

+			case ComponentEditPart.VISUAL_ID:

+				return getComponent_PackagedElementShape_ContainedLinks(view);

+			case ModelEditPart.VISUAL_ID:

+				return getModel_Shape_ContainedLinks(view);

+			case PackageEditPart.VISUAL_ID:

+				return getPackage_Shape_ContainedLinks(view);

+			case RectangleInterfaceEditPart.VISUAL_ID:

+				return getInterface_ClassifierShape_ContainedLinks(view);

+			case CommentEditPart.VISUAL_ID:

+				return getComment_Shape_ContainedLinks(view);

+			case ConstraintEditPart.VISUAL_ID:

+				return getConstraint_Shape_ContainedLinks(view);

+			case DefaultNamedElementEditPart.VISUAL_ID:

+				return getNamedElement_DefaultShape_ContainedLinks(view);

+			case InterfaceEditPart.VISUAL_ID:

+				return getInterface_Shape_ContainedLinks(view);

+			case PortEditPart.VISUAL_ID:

+				return getPort_Shape_ContainedLinks(view);

+			case ModelEditPartCN.VISUAL_ID:

+				return getModel_Shape_CN_ContainedLinks(view);

+			case PackageEditPartCN.VISUAL_ID:

+				return getPackage_Shape_CN_ContainedLinks(view);

+			case RectangleInterfaceEditPartCN.VISUAL_ID:

+				return getInterface_ClassifierShape_CN_ContainedLinks(view);

+			case ComponentEditPartCN.VISUAL_ID:

+				return getComponent_PackagedElementShape_CCN_ContainedLinks(view);

+			case ComponentEditPartPCN.VISUAL_ID:

+				return getComponent_PackagedElementShape_CN_ContainedLinks(view);

+			case CommentEditPartPCN.VISUAL_ID:

+				return getComment_Shape_CN_ContainedLinks(view);

+			case ConstraintEditPartPCN.VISUAL_ID:

+				return getConstraint_Shape_CN_ContainedLinks(view);

+			case PropertyForInterfaceEditPart.VISUAL_ID:

+				return getProperty_InterfaceAttributeLabel_ContainedLinks(view);

+			case OperationForInterfaceEditPart.VISUAL_ID:

+				return getOperation_InterfaceOperationLabel_ContainedLinks(view);

+			case ReceptionInInterfaceEditPart.VISUAL_ID:

+				return getReception_InterfaceReceptionLabel_ContainedLinks(view);

+			case InterfaceEditPartPCN.VISUAL_ID:

+				return getInterface_Shape_CN_ContainedLinks(view);

+			case PropertyPartEditPartCN.VISUAL_ID:

+				return getProperty_Shape_ContainedLinks(view);

+			case UsageEditPart.VISUAL_ID:

+				return getUsage_Edge_ContainedLinks(view);

+			case InterfaceRealizationEditPart.VISUAL_ID:

+				return getInterfaceRealization_Edge_ContainedLinks(view);

+			case GeneralizationEditPart.VISUAL_ID:

+				return getGeneralization_Edge_ContainedLinks(view);

+			case SubstitutionEditPart.VISUAL_ID:

+				return getSubstitution_Edge_ContainedLinks(view);

+			case ManifestationEditPart.VISUAL_ID:

+				return getManifestation_Edge_ContainedLinks(view);

+			case ComponentRealizationEditPart.VISUAL_ID:

+				return getComponentRealization_Edge_ContainedLinks(view);

+			case AbstractionEditPart.VISUAL_ID:

+				return getAbstraction_Edge_ContainedLinks(view);

+			case DependencyEditPart.VISUAL_ID:

+				return getDependency_Edge_ContainedLinks(view);

+			case DependencyBranchEditPart.VISUAL_ID:

+				return getDependency_BranchEdge_ContainedLinks(view);

+			case ConnectorEditPart.VISUAL_ID:

+				return getConnector_Edge_ContainedLinks(view);

+			}

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public List<UMLLinkDescriptor> getIncomingLinks(View view) {

+		String vid = UMLVisualIDRegistry.getVisualID(view);

+		if (vid != null) {

+			switch (vid) {

+			case DependencyNodeEditPart.VISUAL_ID:

+				return getDependency_Shape_IncomingLinks(view);

+			case ComponentEditPart.VISUAL_ID:

+				return getComponent_PackagedElementShape_IncomingLinks(view);

+			case ModelEditPart.VISUAL_ID:

+				return getModel_Shape_IncomingLinks(view);

+			case PackageEditPart.VISUAL_ID:

+				return getPackage_Shape_IncomingLinks(view);

+			case RectangleInterfaceEditPart.VISUAL_ID:

+				return getInterface_ClassifierShape_IncomingLinks(view);

+			case CommentEditPart.VISUAL_ID:

+				return getComment_Shape_IncomingLinks(view);

+			case ConstraintEditPart.VISUAL_ID:

+				return getConstraint_Shape_IncomingLinks(view);

+			case DefaultNamedElementEditPart.VISUAL_ID:

+				return getNamedElement_DefaultShape_IncomingLinks(view);

+			case InterfaceEditPart.VISUAL_ID:

+				return getInterface_Shape_IncomingLinks(view);

+			case PortEditPart.VISUAL_ID:

+				return getPort_Shape_IncomingLinks(view);

+			case ModelEditPartCN.VISUAL_ID:

+				return getModel_Shape_CN_IncomingLinks(view);

+			case PackageEditPartCN.VISUAL_ID:

+				return getPackage_Shape_CN_IncomingLinks(view);

+			case RectangleInterfaceEditPartCN.VISUAL_ID:

+				return getInterface_ClassifierShape_CN_IncomingLinks(view);

+			case ComponentEditPartCN.VISUAL_ID:

+				return getComponent_PackagedElementShape_CCN_IncomingLinks(view);

+			case ComponentEditPartPCN.VISUAL_ID:

+				return getComponent_PackagedElementShape_CN_IncomingLinks(view);

+			case CommentEditPartPCN.VISUAL_ID:

+				return getComment_Shape_CN_IncomingLinks(view);

+			case ConstraintEditPartPCN.VISUAL_ID:

+				return getConstraint_Shape_CN_IncomingLinks(view);

+			case PropertyForInterfaceEditPart.VISUAL_ID:

+				return getProperty_InterfaceAttributeLabel_IncomingLinks(view);

+			case OperationForInterfaceEditPart.VISUAL_ID:

+				return getOperation_InterfaceOperationLabel_IncomingLinks(view);

+			case ReceptionInInterfaceEditPart.VISUAL_ID:

+				return getReception_InterfaceReceptionLabel_IncomingLinks(view);

+			case InterfaceEditPartPCN.VISUAL_ID:

+				return getInterface_Shape_CN_IncomingLinks(view);

+			case PropertyPartEditPartCN.VISUAL_ID:

+				return getProperty_Shape_IncomingLinks(view);

+			case UsageEditPart.VISUAL_ID:

+				return getUsage_Edge_IncomingLinks(view);

+			case InterfaceRealizationEditPart.VISUAL_ID:

+				return getInterfaceRealization_Edge_IncomingLinks(view);

+			case GeneralizationEditPart.VISUAL_ID:

+				return getGeneralization_Edge_IncomingLinks(view);

+			case SubstitutionEditPart.VISUAL_ID:

+				return getSubstitution_Edge_IncomingLinks(view);

+			case ManifestationEditPart.VISUAL_ID:

+				return getManifestation_Edge_IncomingLinks(view);

+			case ComponentRealizationEditPart.VISUAL_ID:

+				return getComponentRealization_Edge_IncomingLinks(view);

+			case AbstractionEditPart.VISUAL_ID:

+				return getAbstraction_Edge_IncomingLinks(view);

+			case DependencyEditPart.VISUAL_ID:

+				return getDependency_Edge_IncomingLinks(view);

+			case DependencyBranchEditPart.VISUAL_ID:

+				return getDependency_BranchEdge_IncomingLinks(view);

+			case ConnectorEditPart.VISUAL_ID:

+				return getConnector_Edge_IncomingLinks(view);

+			}

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public List<UMLLinkDescriptor> getOutgoingLinks(View view) {

+		String vid = UMLVisualIDRegistry.getVisualID(view);

+		if (vid != null) {

+			switch (vid) {

+			case DependencyNodeEditPart.VISUAL_ID:

+				return getDependency_Shape_OutgoingLinks(view);

+			case ComponentEditPart.VISUAL_ID:

+				return getComponent_PackagedElementShape_OutgoingLinks(view);

+			case ModelEditPart.VISUAL_ID:

+				return getModel_Shape_OutgoingLinks(view);

+			case PackageEditPart.VISUAL_ID:

+				return getPackage_Shape_OutgoingLinks(view);

+			case RectangleInterfaceEditPart.VISUAL_ID:

+				return getInterface_ClassifierShape_OutgoingLinks(view);

+			case CommentEditPart.VISUAL_ID:

+				return getComment_Shape_OutgoingLinks(view);

+			case ConstraintEditPart.VISUAL_ID:

+				return getConstraint_Shape_OutgoingLinks(view);

+			case DefaultNamedElementEditPart.VISUAL_ID:

+				return getNamedElement_DefaultShape_OutgoingLinks(view);

+			case InterfaceEditPart.VISUAL_ID:

+				return getInterface_Shape_OutgoingLinks(view);

+			case PortEditPart.VISUAL_ID:

+				return getPort_Shape_OutgoingLinks(view);

+			case ModelEditPartCN.VISUAL_ID:

+				return getModel_Shape_CN_OutgoingLinks(view);

+			case PackageEditPartCN.VISUAL_ID:

+				return getPackage_Shape_CN_OutgoingLinks(view);

+			case RectangleInterfaceEditPartCN.VISUAL_ID:

+				return getInterface_ClassifierShape_CN_OutgoingLinks(view);

+			case ComponentEditPartCN.VISUAL_ID:

+				return getComponent_PackagedElementShape_CCN_OutgoingLinks(view);

+			case ComponentEditPartPCN.VISUAL_ID:

+				return getComponent_PackagedElementShape_CN_OutgoingLinks(view);

+			case CommentEditPartPCN.VISUAL_ID:

+				return getComment_Shape_CN_OutgoingLinks(view);

+			case ConstraintEditPartPCN.VISUAL_ID:

+				return getConstraint_Shape_CN_OutgoingLinks(view);

+			case PropertyForInterfaceEditPart.VISUAL_ID:

+				return getProperty_InterfaceAttributeLabel_OutgoingLinks(view);

+			case OperationForInterfaceEditPart.VISUAL_ID:

+				return getOperation_InterfaceOperationLabel_OutgoingLinks(view);

+			case ReceptionInInterfaceEditPart.VISUAL_ID:

+				return getReception_InterfaceReceptionLabel_OutgoingLinks(view);

+			case InterfaceEditPartPCN.VISUAL_ID:

+				return getInterface_Shape_CN_OutgoingLinks(view);

+			case PropertyPartEditPartCN.VISUAL_ID:

+				return getProperty_Shape_OutgoingLinks(view);

+			case UsageEditPart.VISUAL_ID:

+				return getUsage_Edge_OutgoingLinks(view);

+			case InterfaceRealizationEditPart.VISUAL_ID:

+				return getInterfaceRealization_Edge_OutgoingLinks(view);

+			case GeneralizationEditPart.VISUAL_ID:

+				return getGeneralization_Edge_OutgoingLinks(view);

+			case SubstitutionEditPart.VISUAL_ID:

+				return getSubstitution_Edge_OutgoingLinks(view);

+			case ManifestationEditPart.VISUAL_ID:

+				return getManifestation_Edge_OutgoingLinks(view);

+			case ComponentRealizationEditPart.VISUAL_ID:

+				return getComponentRealization_Edge_OutgoingLinks(view);

+			case AbstractionEditPart.VISUAL_ID:

+				return getAbstraction_Edge_OutgoingLinks(view);

+			case DependencyEditPart.VISUAL_ID:

+				return getDependency_Edge_OutgoingLinks(view);

+			case DependencyBranchEditPart.VISUAL_ID:

+				return getDependency_BranchEdge_OutgoingLinks(view);

+			case ConnectorEditPart.VISUAL_ID:

+				return getConnector_Edge_OutgoingLinks(view);

+			}

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPackage_ComponentDiagram_ContainedLinks(View view) {

+		Package modelElement = (Package) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDependency_Shape_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_ContainedLinks(View view) {

+		Component modelElement = (Component) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_Edge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getModel_Shape_ContainedLinks(View view) {

+		Model modelElement = (Model) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPackage_Shape_ContainedLinks(View view) {

+		Package modelElement = (Package) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_ClassifierShape_ContainedLinks(View view) {

+		Interface modelElement = (Interface) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComment_Shape_ContainedLinks(View view) {

+		Comment modelElement = (Comment) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConstraint_Shape_ContainedLinks(View view) {

+		Constraint modelElement = (Constraint) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getNamedElement_DefaultShape_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_Shape_ContainedLinks(View view) {

+		Interface modelElement = (Interface) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPort_Shape_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getModel_Shape_CN_ContainedLinks(View view) {

+		Model modelElement = (Model) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPackage_Shape_CN_ContainedLinks(View view) {

+		Package modelElement = (Package) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_ClassifierShape_CN_ContainedLinks(View view) {

+		Interface modelElement = (Interface) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_CCN_ContainedLinks(View view) {

+		Component modelElement = (Component) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_Edge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_CN_ContainedLinks(View view) {

+		Component modelElement = (Component) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_Edge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComment_Shape_CN_ContainedLinks(View view) {

+		Comment modelElement = (Comment) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConstraint_Shape_CN_ContainedLinks(View view) {

+		Constraint modelElement = (Constraint) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProperty_InterfaceAttributeLabel_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOperation_InterfaceOperationLabel_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getReception_InterfaceReceptionLabel_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_Shape_CN_ContainedLinks(View view) {

+		Interface modelElement = (Interface) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProperty_Shape_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getUsage_Edge_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterfaceRealization_Edge_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getGeneralization_Edge_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSubstitution_Edge_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getManifestation_Edge_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponentRealization_Edge_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getAbstraction_Edge_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDependency_Edge_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDependency_BranchEdge_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConnector_Edge_ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_IncomingLinks(View view) {

+		Component modelElement = (Component) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_ClassifierShape_IncomingLinks(View view) {

+		Interface modelElement = (Interface) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_Shape_IncomingLinks(View view) {

+		Interface modelElement = (Interface) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPort_Shape_IncomingLinks(View view) {

+		Port modelElement = (Port) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_ClassifierShape_CN_IncomingLinks(View view) {

+		Interface modelElement = (Interface) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_CCN_IncomingLinks(View view) {

+		Component modelElement = (Component) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_CN_IncomingLinks(View view) {

+		Component modelElement = (Component) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProperty_InterfaceAttributeLabel_IncomingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOperation_InterfaceOperationLabel_IncomingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getReception_InterfaceReceptionLabel_IncomingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_Shape_CN_IncomingLinks(View view) {

+		Interface modelElement = (Interface) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProperty_Shape_IncomingLinks(View view) {

+		Property modelElement = (Property) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getUsage_Edge_IncomingLinks(View view) {

+		Usage modelElement = (Usage) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterfaceRealization_Edge_IncomingLinks(View view) {

+		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSubstitution_Edge_IncomingLinks(View view) {

+		Substitution modelElement = (Substitution) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponentRealization_Edge_IncomingLinks(View view) {

+		ComponentRealization modelElement = (ComponentRealization) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getAbstraction_Edge_IncomingLinks(View view) {

+		Abstraction modelElement = (Abstraction) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	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<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConnector_Edge_IncomingLinks(View view) {

+		Connector modelElement = (Connector) view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter

+				.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

+		result.addAll(

+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDependency_Shape_OutgoingLinks(View view) {

+		Dependency modelElement = (Dependency) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_OutgoingLinks(View view) {

+		Component modelElement = (Component) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getModel_Shape_OutgoingLinks(View view) {

+		Model modelElement = (Model) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPackage_Shape_OutgoingLinks(View view) {

+		Package modelElement = (Package) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_ClassifierShape_OutgoingLinks(View view) {

+		Interface modelElement = (Interface) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComment_Shape_OutgoingLinks(View view) {

+		Comment modelElement = (Comment) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConstraint_Shape_OutgoingLinks(View view) {

+		Constraint modelElement = (Constraint) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getNamedElement_DefaultShape_OutgoingLinks(View view) {

+		NamedElement modelElement = (NamedElement) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_Shape_OutgoingLinks(View view) {

+		Interface modelElement = (Interface) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPort_Shape_OutgoingLinks(View view) {

+		Port modelElement = (Port) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getModel_Shape_CN_OutgoingLinks(View view) {

+		Model modelElement = (Model) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPackage_Shape_CN_OutgoingLinks(View view) {

+		Package modelElement = (Package) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_ClassifierShape_CN_OutgoingLinks(View view) {

+		Interface modelElement = (Interface) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_CCN_OutgoingLinks(View view) {

+		Component modelElement = (Component) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_PackagedElementShape_CN_OutgoingLinks(View view) {

+		Component modelElement = (Component) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComment_Shape_CN_OutgoingLinks(View view) {

+		Comment modelElement = (Comment) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConstraint_Shape_CN_OutgoingLinks(View view) {

+		Constraint modelElement = (Constraint) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProperty_InterfaceAttributeLabel_OutgoingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOperation_InterfaceOperationLabel_OutgoingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getReception_InterfaceReceptionLabel_OutgoingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_Shape_CN_OutgoingLinks(View view) {

+		Interface modelElement = (Interface) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProperty_Shape_OutgoingLinks(View view) {

+		Property modelElement = (Property) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getUsage_Edge_OutgoingLinks(View view) {

+		Usage modelElement = (Usage) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterfaceRealization_Edge_OutgoingLinks(View view) {

+		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getGeneralization_Edge_OutgoingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSubstitution_Edge_OutgoingLinks(View view) {

+		Substitution modelElement = (Substitution) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getManifestation_Edge_OutgoingLinks(View view) {

+		Manifestation modelElement = (Manifestation) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponentRealization_Edge_OutgoingLinks(View view) {

+		ComponentRealization modelElement = (ComponentRealization) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getAbstraction_Edge_OutgoingLinks(View view) {

+		Abstraction modelElement = (Abstraction) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDependency_Edge_OutgoingLinks(View view) {

+		Dependency modelElement = (Dependency) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDependency_BranchEdge_OutgoingLinks(View view) {

+		Dependency modelElement = (Dependency) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConnector_Edge_OutgoingLinks(View view) {

+		Connector modelElement = (Connector) view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Usage_Edge(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof Usage) {

+				continue;

+			}

+			Usage link = (Usage) linkObject;

+			if (!UsageEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_Edge, UsageEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_Edge(

+			Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof InterfaceRealization) {

+				continue;

+			}

+			InterfaceRealization link = (InterfaceRealization) linkObject;

+			if (!InterfaceRealizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			Interface dst = link.getContract();

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_Edge,

+					InterfaceRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_Edge(Classifier container) {

+		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;

+			}

+			Generalization link = (Generalization) linkObject;

+			if (!GeneralizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			Classifier dst = link.getGeneral();

+			Classifier src = link.getSpecific();

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_Edge,

+					GeneralizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Substitution_Edge(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof Substitution) {

+				continue;

+			}

+			Substitution link = (Substitution) linkObject;

+			if (!SubstitutionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_Edge,

+					SubstitutionEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Manifestation_Edge(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof Manifestation) {

+				continue;

+			}

+			Manifestation link = (Manifestation) linkObject;

+			if (!ManifestationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_Edge,

+					ManifestationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ComponentRealization_Edge(

+			Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof ComponentRealization) {

+				continue;

+			}

+			ComponentRealization link = (ComponentRealization) linkObject;

+			if (!ComponentRealizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_Edge,

+					ComponentRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Abstraction_Edge(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof Abstraction) {

+				continue;

+			}

+			Abstraction link = (Abstraction) linkObject;

+			if (!AbstractionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_Edge,

+					AbstractionEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_Edge(Package container) {

+		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;

+			}

+			Dependency link = (Dependency) linkObject;

+			if (!DependencyEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge,

+					DependencyEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_BranchEdge(Package container) {

+		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;

+			}

+			Dependency link = (Dependency) linkObject;

+			if (!DependencyBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge,

+					DependencyBranchEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Connector_Edge(

+			StructuredClassifier container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getOwnedConnectors().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof Connector) {

+				continue;

+			}

+			Connector link = (Connector) linkObject;

+			if (!ConnectorEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getEnds();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof ConnectorEnd) {

+				continue;

+			}

+			ConnectorEnd dst = (ConnectorEnd) theTarget;

+			List<?> sources = link.getEnds();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof ConnectorEnd) {

+				continue;

+			}

+			ConnectorEnd src = (ConnectorEnd) theSource;

+			result.add(

+					new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Connector_Edge, ConnectorEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

+		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 Usage) {

+				continue;

+			}

+			Usage link = (Usage) setting.getEObject();

+			if (!UsageEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Usage_Edge, UsageEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(Interface target,

+			CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInterfaceRealization_Contract()

+					|| false == setting.getEObject() instanceof InterfaceRealization) {

+				continue;

+			}

+			InterfaceRealization link = (InterfaceRealization) setting.getEObject();

+			if (!InterfaceRealizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InterfaceRealization_Edge,

+					InterfaceRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_Edge(Classifier target,

+			CrossReferenceAdapter crossReferencer) {

+		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) {

+				continue;

+			}

+			Generalization link = (Generalization) setting.getEObject();

+			if (!GeneralizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			Classifier src = link.getSpecific();

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Generalization_Edge,

+					GeneralizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Substitution_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

+		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 Substitution) {

+				continue;

+			}

+			Substitution link = (Substitution) setting.getEObject();

+			if (!SubstitutionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Substitution_Edge,

+					SubstitutionEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Manifestation_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

+		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) {

+				continue;

+			}

+			Manifestation link = (Manifestation) setting.getEObject();

+			if (!ManifestationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Manifestation_Edge,

+					ManifestationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ComponentRealization_Edge(

+			NamedElement target, CrossReferenceAdapter crossReferencer) {

+		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 ComponentRealization) {

+				continue;

+			}

+			ComponentRealization link = (ComponentRealization) setting.getEObject();

+			if (!ComponentRealizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.ComponentRealization_Edge,

+					ComponentRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Abstraction_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

+		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 Abstraction) {

+				continue;

+			}

+			Abstraction link = (Abstraction) setting.getEObject();

+			if (!AbstractionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Abstraction_Edge,

+					AbstractionEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(

+			Element target, CrossReferenceAdapter crossReferencer) {

+		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));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(

+			Element target, CrossReferenceAdapter crossReferencer) {

+		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));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

+		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) {

+				continue;

+			}

+			Dependency link = (Dependency) setting.getEObject();

+			if (!DependencyEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_Edge,

+					DependencyEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_BranchEdge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

+		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) {

+				continue;

+			}

+			Dependency link = (Dependency) setting.getEObject();

+			if (!DependencyBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_BranchEdge,

+					DependencyBranchEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Usage_Edge(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Package) {

+				container = (Package) element;

+			}

+		}

+		if (container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof Usage) {

+				continue;

+			}

+			Usage link = (Usage) linkObject;

+			if (!UsageEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			if (src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_Edge, UsageEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(

+			NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Package) {

+				container = (Package) element;

+			}

+		}

+		if (container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof InterfaceRealization) {

+				continue;

+			}

+			InterfaceRealization link = (InterfaceRealization) linkObject;

+			if (!InterfaceRealizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			Interface dst = link.getContract();

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			if (src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_Edge,

+					InterfaceRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Generalization_Edge(Classifier source) {

+		Classifier container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Classifier) {

+				container = (Classifier) element;

+			}

+		}

+		if (container == null) {

+			return Collections.emptyList();

+		}

+		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;

+			}

+			Generalization link = (Generalization) linkObject;

+			if (!GeneralizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			Classifier dst = link.getGeneral();

+			Classifier src = link.getSpecific();

+			if (src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_Edge,

+					GeneralizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Substitution_Edge(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Package) {

+				container = (Package) element;

+			}

+		}

+		if (container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof Substitution) {

+				continue;

+			}

+			Substitution link = (Substitution) linkObject;

+			if (!SubstitutionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			if (src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_Edge,

+					SubstitutionEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Manifestation_Edge(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Package) {

+				container = (Package) element;

+			}

+		}

+		if (container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof Manifestation) {

+				continue;

+			}

+			Manifestation link = (Manifestation) linkObject;

+			if (!ManifestationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			if (src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_Edge,

+					ManifestationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(

+			NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Package) {

+				container = (Package) element;

+			}

+		}

+		if (container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof ComponentRealization) {

+				continue;

+			}

+			ComponentRealization link = (ComponentRealization) linkObject;

+			if (!ComponentRealizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			if (src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_Edge,

+					ComponentRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Abstraction_Edge(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Package) {

+				container = (Package) element;

+			}

+		}

+		if (container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof Abstraction) {

+				continue;

+			}

+			Abstraction link = (Abstraction) linkObject;

+			if (!AbstractionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			if (src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_Edge,

+					AbstractionEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(

+			Comment source) {

+		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));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(

+			Constraint source) {

+		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));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_Edge(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Package) {

+				container = (Package) element;

+			}

+		}

+		if (container == null) {

+			return Collections.emptyList();

+		}

+		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;

+			}

+			Dependency link = (Dependency) linkObject;

+			if (!DependencyEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			if (src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge,

+					DependencyEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if (element instanceof Package) {

+				container = (Package) element;

+			}

+		}

+		if (container == null) {

+			return Collections.emptyList();

+		}

+		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;

+			}

+			Dependency link = (Dependency) linkObject;

+			if (!DependencyBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if (false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement) theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if (false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement) theSource;

+			if (src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge,

+					DependencyBranchEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDocumentProvider.java
index 35a90bd2485..749798f9519 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDocumentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLDocumentProvider.java
@@ -1,1049 +1,1049 @@
-/**
- * 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.component.part;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.MultiRule;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.AbstractDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util.DiagramIOUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * @generated
- */
-public class UMLDocumentProvider extends AbstractDocumentProvider implements IDiagramDocumentProvider {
-
-	/**
-	 * @generated
-	 */
-	@Override
-	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", //$NON-NLS-1$
-									"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
-					null));
-		}
-		IEditorInput editorInput = (IEditorInput) element;
-		IDiagramDocument document = (IDiagramDocument) createDocument(editorInput);
-
-		ResourceSetInfo info = new ResourceSetInfo(document, editorInput);
-		info.setModificationStamp(computeModificationStamp(info));
-		info.fStatus = null;
-		return info;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	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", //$NON-NLS-1$
-									"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
-					null));
-		}
-		IDocument document = createEmptyDocument();
-		setDocumentContent(document, (IEditorInput) element);
-		setupDocument(element, document);
-		return document;
-	}
-
-	/**
-	 * Sets up the given document as it would be provided for the given element. The
-	 * content of the document is not changed. This default implementation is empty.
-	 * Subclasses may reimplement.
-	 *
-	 * @param element
-	 *            the blue-print element
-	 * @param document
-	 *            the document to set up
-	 * @generated
-	 */
-	protected void setupDocument(Object element, IDocument document) {
-		// for subclasses
-	}
-
-	/**
-	 * @generated
-	 */
-	private long computeModificationStamp(ResourceSetInfo info) {
-		int result = 0;
-		for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-			Resource nextResource = it.next();
-			IFile file = WorkspaceSynchronizer.getFile(nextResource);
-			if (file != null) {
-				if (file.getLocation() != null) {
-					result += file.getLocation().toFile().lastModified();
-				} else {
-					result += file.getModificationStamp();
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IDocument createEmptyDocument() {
-		DiagramDocument document = new DiagramDocument();
-		document.setEditingDomain(createEditingDomain());
-		return document;
-	}
-
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain createEditingDomain() {
-		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();
-		editingDomain.setID("org.eclipse.papyrus.uml.diagram.component.EditingDomain"); //$NON-NLS-1$
-		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() {
-
-			private Notifier myTarger;
-
-			@Override
-			public Notifier getTarget() {
-				return myTarger;
-			}
-
-			@Override
-			public boolean isAdapterForType(Object type) {
-				return false;
-			}
-
-			@Override
-			public void notifyChanged(Notification notification) {
-				if (diagramResourceModifiedFilter.matches(notification)) {
-					Object value = notification.getNewValue();
-					if (value instanceof Resource) {
-						((Resource) value).setTrackingModification(true);
-					}
-				}
-			}
-
-			@Override
-			public void setTarget(Notifier newTarget) {
-				myTarger = newTarget;
-			}
-
-		});
-
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setDocumentContent(IDocument document, IEditorInput element) throws CoreException {
-		IDiagramDocument diagramDocument = (IDiagramDocument) document;
-		TransactionalEditingDomain domain = diagramDocument.getEditingDomain();
-		if (element instanceof FileEditorInput) {
-			IStorage storage = ((FileEditorInput) element).getStorage();
-			Diagram diagram = DiagramIOUtil.load(domain, storage, true, getProgressMonitor());
-			document.setContent(diagram);
-		} else if (element instanceof URIEditorInput) {
-			URI uri = ((URIEditorInput) element).getURI();
-			Resource resource = null;
-			try {
-				resource = domain.getResourceSet().getResource(uri.trimFragment(), false);
-				if (resource == null) {
-					resource = domain.getResourceSet().createResource(uri.trimFragment());
-				}
-				if (!resource.isLoaded()) {
-					try {
-						@SuppressWarnings({ "rawtypes", "unchecked" })
-						Map<?, ?> options = new HashMap(GMFResourceFactory.getDefaultLoadOptions());
-						// @see 171060
-						// options.put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-						resource.load(options);
-					} catch (IOException e) {
-						resource.unload();
-						throw e;
-					}
-				}
-				if (uri.fragment() != null) {
-					EObject rootElement = resource.getEObject(uri.fragment());
-					if (rootElement instanceof Diagram) {
-						document.setContent(rootElement);
-						return;
-					}
-				} else {
-					for (Iterator<EObject> it = resource.getContents().iterator(); it.hasNext();) {
-						Object rootElement = it.next();
-						if (rootElement instanceof Diagram) {
-							document.setContent(rootElement);
-							return;
-						}
-					}
-				}
-				throw new RuntimeException(Messages.UMLDocumentProvider_NoDiagramInResourceError);
-			} catch (Exception e) {
-				CoreException thrownExcp = null;
-				if (e instanceof CoreException) {
-					thrownExcp = (CoreException) e;
-				} else {
-					String msg = e.getLocalizedMessage();
-					thrownExcp = new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,
-							msg != null ? msg : Messages.UMLDocumentProvider_DiagramLoadingError, e));
-				}
-				throw thrownExcp;
-			}
-		} else {
-			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,
-					NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError,
-							new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
-									"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
-					null));
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public long getModificationStamp(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			return computeModificationStamp(info);
-		}
-		return super.getModificationStamp(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isDeleted(Object element) {
-		IDiagramDocument document = getDiagramDocument(element);
-		if (document != null) {
-			Resource diagramResource = document.getDiagram().eResource();
-			if (diagramResource != null) {
-				IFile file = WorkspaceSynchronizer.getFile(diagramResource);
-				return file == null || file.getLocation() == null || !file.getLocation().toFile().exists();
-			}
-		}
-		return super.isDeleted(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	public ResourceSetInfo getResourceSetInfo(Object editorInput) {
-		return (ResourceSetInfo) super.getElementInfo(editorInput);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void disposeElementInfo(Object element, ElementInfo info) {
-		if (info instanceof ResourceSetInfo) {
-			ResourceSetInfo resourceSetInfo = (ResourceSetInfo) info;
-			resourceSetInfo.dispose();
-		}
-		super.disposeElementInfo(element, info);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void doValidateState(Object element, Object computationContext) throws CoreException {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			LinkedList<IFile> files2Validate = new LinkedList<IFile>();
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null && file.isReadOnly()) {
-					files2Validate.add(file);
-				}
-			}
-			ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]),
-					computationContext);
-		}
-
-		super.doValidateState(element, computationContext);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isReadOnly(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			if (info.isUpdateCache()) {
-				try {
-					updateCache(element);
-				} catch (CoreException ex) {
-					UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_isModifiable, ex);
-					// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable
-				}
-			}
-			return info.isReadOnly();
-		}
-		return super.isReadOnly(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isModifiable(Object element) {
-		if (!isStateValidated(element)) {
-			if (element instanceof FileEditorInput || element instanceof URIEditorInput) {
-				return true;
-			}
-		}
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			if (info.isUpdateCache()) {
-				try {
-					updateCache(element);
-				} catch (CoreException ex) {
-					UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_isModifiable, ex);
-					// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable
-				}
-			}
-			return info.isModifiable();
-		}
-		return super.isModifiable(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void updateCache(Object element) throws CoreException {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null && file.isReadOnly()) {
-					info.setReadOnly(true);
-					info.setModifiable(false);
-					return;
-				}
-			}
-			info.setReadOnly(false);
-			info.setModifiable(true);
-			return;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void doUpdateStateCache(Object element) throws CoreException {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			info.setUpdateCache(true);
-		}
-		super.doUpdateStateCache(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isSynchronized(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			return info.isSynchronized();
-		}
-		return super.isSynchronized(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected ISchedulingRule getResetRule(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null) {
-					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(file));
-				}
-			}
-			return new MultiRule(rules.toArray(new ISchedulingRule[rules.size()]));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected ISchedulingRule getSaveRule(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null) {
-					rules.add(computeSchedulingRule(file));
-				}
-			}
-			return new MultiRule(rules.toArray(new ISchedulingRule[rules.size()]));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected ISchedulingRule getSynchronizeRule(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null) {
-					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().refreshRule(file));
-				}
-			}
-			return new MultiRule(rules.toArray(new ISchedulingRule[rules.size()]));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected ISchedulingRule getValidateStateRule(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			LinkedList<ISchedulingRule> files = new LinkedList<ISchedulingRule>();
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null) {
-					files.add(file);
-				}
-			}
-			return ResourcesPlugin.getWorkspace().getRuleFactory()
-					.validateEditRule(files.toArray(new IFile[files.size()]));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ISchedulingRule computeSchedulingRule(IResource toCreateOrModify) {
-		if (toCreateOrModify.exists()) {
-			return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(toCreateOrModify);
-		}
-		IResource parent = toCreateOrModify;
-		do {
-			/*
-			 * XXX This is a workaround for
-			 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=67601
-			 * IResourceRuleFactory.createRule should iterate the hierarchy
-			 * itself.
-			 */
-			toCreateOrModify = parent;
-			parent = toCreateOrModify.getParent();
-		} while (parent != null && !parent.exists());
-
-		return ResourcesPlugin.getWorkspace().getRuleFactory().createRule(toCreateOrModify);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				handleElementChanged(info, nextResource, monitor);
-			}
-			return;
-		}
-		super.doSynchronize(element, monitor);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite)
-			throws CoreException {
-		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));
-			}
-			info.stopResourceListening();
-			fireElementStateChanging(element);
-			try {
-				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()));
-					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));
-						}
-					}
-					monitor.worked(1);
-				}
-				monitor.done();
-				info.setModificationStamp(computeModificationStamp(info));
-			} catch (RuntimeException x) {
-				fireElementStateChangeFailed(element);
-				throw x;
-			} finally {
-				info.startResourceListening();
-			}
-		} else {
-			URI newResoruceURI;
-			List<IFile> affectedFiles = null;
-			if (element instanceof FileEditorInput) {
-				IFile newFile = ((FileEditorInput) element).getFile();
-				affectedFiles = Collections.singletonList(newFile);
-				newResoruceURI = URI.createPlatformResourceURI(newFile.getFullPath().toString(), true);
-			} else if (element instanceof URIEditorInput) {
-				newResoruceURI = ((URIEditorInput) element).getURI();
-			} else {
-				fireElementStateChangeFailed(element);
-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,
-						NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError,
-								new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$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 //$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 Diagram diagramCopy = EcoreUtil.copy(diagramDocument.getDiagram());
-			try {
-				new AbstractTransactionalCommand(diagramDocument.getEditingDomain(),
-						NLS.bind(Messages.UMLDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) {
-					@Override
-					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-							throws ExecutionException {
-						newResource.getContents().add(diagramCopy);
-						return CommandResult.newOKCommandResult();
-					}
-				}.execute(monitor, null);
-				newResource.save(UMLDiagramEditorUtil.getSaveOptions());
-			} catch (ExecutionException e) {
-				fireElementStateChangeFailed(element);
-				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));
-			}
-			newResource.unload();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleElementChanged(ResourceSetInfo info, Resource changedResource, IProgressMonitor monitor) {
-		IFile file = WorkspaceSynchronizer.getFile(changedResource);
-		if (file != null) {
-			try {
-				file.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-			} catch (CoreException 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
-			}
-		}
-		changedResource.unload();
-
-		fireElementContentAboutToBeReplaced(info.getEditorInput());
-		removeUnchangedElementListeners(info.getEditorInput(), info);
-		info.fStatus = null;
-		try {
-			setDocumentContent(info.fDocument, info.getEditorInput());
-		} catch (CoreException e) {
-			info.fStatus = e.getStatus();
-		}
-		if (!info.fCanBeSaved) {
-			info.setModificationStamp(computeModificationStamp(info));
-		}
-		addUnchangedElementListeners(info.getEditorInput(), info);
-		fireElementContentReplaced(info.getEditorInput());
-	}
-
-	/**
-	 * @generated
-	 */
-	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));
-			fireElementMoved(input, newFile == null ? null : new FileEditorInput(newFile));
-			return;
-		}
-		// TODO: append suffix to the URI! (use diagram as a parameter)
-		fireElementMoved(input, new URIEditorInput(uri));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IEditorInput createInputWithEditingDomain(IEditorInput editorInput, TransactionalEditingDomain domain) {
-		return editorInput;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IDiagramDocument getDiagramDocument(Object element) {
-		IDocument doc = getDocument(element);
-		if (doc instanceof IDiagramDocument) {
-			return (IDiagramDocument) doc;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected class ResourceSetInfo extends ElementInfo {
-
-		/**
-		 * @generated
-		 */
-		private long myModificationStamp = IResource.NULL_STAMP;
-
-		/**
-		 * @generated
-		 */
-		private WorkspaceSynchronizer mySynchronizer;
-
-		/**
-		 * @generated
-		 */
-		private LinkedList<Resource> myUnSynchronizedResources = new LinkedList<Resource>();
-
-		/**
-		 * @generated
-		 */
-		private IDiagramDocument myDocument;
-
-		/**
-		 * @generated
-		 */
-		private IEditorInput myEditorInput;
-
-		/**
-		 * @generated
-		 */
-		private boolean myUpdateCache = true;
-
-		/**
-		 * @generated
-		 */
-		private boolean myModifiable = false;
-
-		/**
-		 * @generated
-		 */
-		private boolean myReadOnly = true;
-
-		/**
-		 * @generated
-		 */
-		private ResourceSetModificationListener myResourceSetListener;
-
-		/**
-		 * @generated
-		 */
-		public ResourceSetInfo(IDiagramDocument document, IEditorInput editorInput) {
-			super(document);
-			myDocument = document;
-			myEditorInput = editorInput;
-			startResourceListening();
-			myResourceSetListener = new ResourceSetModificationListener(this);
-			getResourceSet().eAdapters().add(myResourceSetListener);
-		}
-
-		/**
-		 * @generated
-		 */
-		public long getModificationStamp() {
-			return myModificationStamp;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void setModificationStamp(long modificationStamp) {
-			myModificationStamp = modificationStamp;
-		}
-
-		/**
-		 * @generated
-		 */
-		public TransactionalEditingDomain getEditingDomain() {
-			return myDocument.getEditingDomain();
-		}
-
-		/**
-		 * @generated
-		 */
-		public ResourceSet getResourceSet() {
-			return getEditingDomain().getResourceSet();
-		}
-
-		/**
-		 * @generated
-		 */
-		public Iterator<Resource> getLoadedResourcesIterator() {
-			return new ArrayList<Resource>(getResourceSet().getResources()).iterator();
-		}
-
-		/**
-		 * @generated
-		 */
-		public IEditorInput getEditorInput() {
-			return myEditorInput;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void dispose() {
-			stopResourceListening();
-			getResourceSet().eAdapters().remove(myResourceSetListener);
-			for (Iterator<Resource> it = getLoadedResourcesIterator(); it.hasNext();) {
-				Resource resource = it.next();
-				resource.unload();
-			}
-			getEditingDomain().dispose();
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean isSynchronized() {
-			return myUnSynchronizedResources.size() == 0;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void setUnSynchronized(Resource resource) {
-			myUnSynchronizedResources.add(resource);
-		}
-
-		/**
-		 * @generated
-		 */
-		public void setSynchronized(Resource resource) {
-			myUnSynchronizedResources.remove(resource);
-		}
-
-		/**
-		 * @generated
-		 */
-		public final void stopResourceListening() {
-			mySynchronizer.dispose();
-			mySynchronizer = null;
-		}
-
-		/**
-		 * @generated
-		 */
-		public final void startResourceListening() {
-			mySynchronizer = new WorkspaceSynchronizer(getEditingDomain(), new SynchronizerDelegate());
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean isUpdateCache() {
-			return myUpdateCache;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void setUpdateCache(boolean update) {
-			myUpdateCache = update;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean isModifiable() {
-			return myModifiable;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void setModifiable(boolean modifiable) {
-			myModifiable = modifiable;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean isReadOnly() {
-			return myReadOnly;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void setReadOnly(boolean readOnly) {
-			myReadOnly = readOnly;
-		}
-
-		/**
-		 * @generated
-		 */
-		private class SynchronizerDelegate implements WorkspaceSynchronizer.Delegate {
-
-			/**
-			 * @generated
-			 */
-			@Override
-			public void dispose() {
-			}
-
-			/**
-			 * @generated
-			 */
-			@Override
-			public boolean handleResourceChanged(final Resource resource) {
-				synchronized (ResourceSetInfo.this) {
-					if (ResourceSetInfo.this.fCanBeSaved) {
-						ResourceSetInfo.this.setUnSynchronized(resource);
-						return true;
-					}
-				}
-				Display.getDefault().asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						handleElementChanged(ResourceSetInfo.this, resource, null);
-					}
-				});
-				return true;
-			}
-
-			/**
-			 * @generated
-			 */
-			@Override
-			public boolean handleResourceDeleted(Resource resource) {
-				synchronized (ResourceSetInfo.this) {
-					if (ResourceSetInfo.this.fCanBeSaved) {
-						ResourceSetInfo.this.setUnSynchronized(resource);
-						return true;
-					}
-				}
-				Display.getDefault().asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						fireElementDeleted(ResourceSetInfo.this.getEditorInput());
-					}
-				});
-				return true;
-			}
-
-			/**
-			 * @generated
-			 */
-			@Override
-			public boolean handleResourceMoved(Resource resource, final URI newURI) {
-				synchronized (ResourceSetInfo.this) {
-					if (ResourceSetInfo.this.fCanBeSaved) {
-						ResourceSetInfo.this.setUnSynchronized(resource);
-						return true;
-					}
-				}
-				if (myDocument.getDiagram().eResource() == resource) {
-					Display.getDefault().asyncExec(new Runnable() {
-						@Override
-						public void run() {
-							handleElementMoved(ResourceSetInfo.this.getEditorInput(), newURI);
-						}
-					});
-				} else {
-					handleResourceDeleted(resource);
-				}
-				return true;
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private class ResourceSetModificationListener extends EContentAdapter {
-
-		/**
-		 * @generated
-		 */
-		private NotificationFilter myModifiedFilter;
-
-		/**
-		 * @generated
-		 */
-		private ResourceSetInfo myInfo;
-
-		/**
-		 * @generated
-		 */
-		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));
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public void notifyChanged(Notification notification) {
-			if (notification.getNotifier() instanceof ResourceSet) {
-				super.notifyChanged(notification);
-			}
-			if (!notification.isTouch() && myModifiedFilter.matches(notification)) {
-				if (notification.getNotifier() instanceof Resource) {
-					Resource resource = (Resource) notification.getNotifier();
-					if (resource.isLoaded()) {
-						boolean modified = false;
-						for (Iterator<Resource> it = myInfo.getLoadedResourcesIterator(); it.hasNext() && !modified;) {
-							Resource nextResource = it.next();
-							if (nextResource.isLoaded()) {
-								modified = nextResource.isModified();
-							}
-						}
-						boolean dirtyStateChanged = false;
-						synchronized (myInfo) {
-							if (modified != myInfo.fCanBeSaved) {
-								myInfo.fCanBeSaved = modified;
-								dirtyStateChanged = true;
-							}
-							if (!resource.isModified()) {
-								myInfo.setSynchronized(resource);
-							}
-						}
-						if (dirtyStateChanged) {
-							fireElementDirtyStateChanged(myInfo.getEditorInput(), modified);
-
-							if (!modified) {
-								myInfo.setModificationStamp(computeModificationStamp(myInfo));
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
+/**

+ * 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.component.part;

+

+import java.io.IOException;

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.IResourceStatus;

+import org.eclipse.core.resources.IStorage;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.core.runtime.jobs.ISchedulingRule;

+import org.eclipse.core.runtime.jobs.MultiRule;

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.Notifier;

+import org.eclipse.emf.common.ui.URIEditorInput;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.util.EContentAdapter;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.emf.transaction.NotificationFilter;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.AbstractDocumentProvider;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorStatusCodes;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util.DiagramIOUtil;

+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.operation.IRunnableContext;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.part.FileEditorInput;

+

+/**

+ * @generated

+ */

+public class UMLDocumentProvider extends AbstractDocumentProvider implements IDiagramDocumentProvider {

+

+	/**

+	 * @generated

+	 */

+	@Override

+	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", //$NON-NLS-1$

+									"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ 

+					null));

+		}

+		IEditorInput editorInput = (IEditorInput) element;

+		IDiagramDocument document = (IDiagramDocument) createDocument(editorInput);

+

+		ResourceSetInfo info = new ResourceSetInfo(document, editorInput);

+		info.setModificationStamp(computeModificationStamp(info));

+		info.fStatus = null;

+		return info;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	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", //$NON-NLS-1$

+									"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ 

+					null));

+		}

+		IDocument document = createEmptyDocument();

+		setDocumentContent(document, (IEditorInput) element);

+		setupDocument(element, document);

+		return document;

+	}

+

+	/**

+	 * Sets up the given document as it would be provided for the given element. The

+	 * content of the document is not changed. This default implementation is empty.

+	 * Subclasses may reimplement.

+	 *

+	 * @param element

+	 *            the blue-print element

+	 * @param document

+	 *            the document to set up

+	 * @generated

+	 */

+	protected void setupDocument(Object element, IDocument document) {

+		// for subclasses

+	}

+

+	/**

+	 * @generated

+	 */

+	private long computeModificationStamp(ResourceSetInfo info) {

+		int result = 0;

+		for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+			Resource nextResource = it.next();

+			IFile file = WorkspaceSynchronizer.getFile(nextResource);

+			if (file != null) {

+				if (file.getLocation() != null) {

+					result += file.getLocation().toFile().lastModified();

+				} else {

+					result += file.getModificationStamp();

+				}

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IDocument createEmptyDocument() {

+		DiagramDocument document = new DiagramDocument();

+		document.setEditingDomain(createEditingDomain());

+		return document;

+	}

+

+	/**

+	 * @generated

+	 */

+	private TransactionalEditingDomain createEditingDomain() {

+		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();

+		editingDomain.setID("org.eclipse.papyrus.uml.diagram.component.EditingDomain"); //$NON-NLS-1$

+		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() {

+

+			private Notifier myTarger;

+

+			@Override

+			public Notifier getTarget() {

+				return myTarger;

+			}

+

+			@Override

+			public boolean isAdapterForType(Object type) {

+				return false;

+			}

+

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (diagramResourceModifiedFilter.matches(notification)) {

+					Object value = notification.getNewValue();

+					if (value instanceof Resource) {

+						((Resource) value).setTrackingModification(true);

+					}

+				}

+			}

+

+			@Override

+			public void setTarget(Notifier newTarget) {

+				myTarger = newTarget;

+			}

+

+		});

+

+		return editingDomain;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setDocumentContent(IDocument document, IEditorInput element) throws CoreException {

+		IDiagramDocument diagramDocument = (IDiagramDocument) document;

+		TransactionalEditingDomain domain = diagramDocument.getEditingDomain();

+		if (element instanceof FileEditorInput) {

+			IStorage storage = ((FileEditorInput) element).getStorage();

+			Diagram diagram = DiagramIOUtil.load(domain, storage, true, getProgressMonitor());

+			document.setContent(diagram);

+		} else if (element instanceof URIEditorInput) {

+			URI uri = ((URIEditorInput) element).getURI();

+			Resource resource = null;

+			try {

+				resource = domain.getResourceSet().getResource(uri.trimFragment(), false);

+				if (resource == null) {

+					resource = domain.getResourceSet().createResource(uri.trimFragment());

+				}

+				if (!resource.isLoaded()) {

+					try {

+						@SuppressWarnings({ "rawtypes", "unchecked" })

+						Map<?, ?> options = new HashMap(GMFResourceFactory.getDefaultLoadOptions());

+						// @see 171060 

+						// options.put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);

+						resource.load(options);

+					} catch (IOException e) {

+						resource.unload();

+						throw e;

+					}

+				}

+				if (uri.fragment() != null) {

+					EObject rootElement = resource.getEObject(uri.fragment());

+					if (rootElement instanceof Diagram) {

+						document.setContent(rootElement);

+						return;

+					}

+				} else {

+					for (Iterator<EObject> it = resource.getContents().iterator(); it.hasNext();) {

+						Object rootElement = it.next();

+						if (rootElement instanceof Diagram) {

+							document.setContent(rootElement);

+							return;

+						}

+					}

+				}

+				throw new RuntimeException(Messages.UMLDocumentProvider_NoDiagramInResourceError);

+			} catch (Exception e) {

+				CoreException thrownExcp = null;

+				if (e instanceof CoreException) {

+					thrownExcp = (CoreException) e;

+				} else {

+					String msg = e.getLocalizedMessage();

+					thrownExcp = new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

+							msg != null ? msg : Messages.UMLDocumentProvider_DiagramLoadingError, e));

+				}

+				throw thrownExcp;

+			}

+		} else {

+			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

+					NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError,

+							new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$

+									"org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ 

+					null));

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public long getModificationStamp(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			return computeModificationStamp(info);

+		}

+		return super.getModificationStamp(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean isDeleted(Object element) {

+		IDiagramDocument document = getDiagramDocument(element);

+		if (document != null) {

+			Resource diagramResource = document.getDiagram().eResource();

+			if (diagramResource != null) {

+				IFile file = WorkspaceSynchronizer.getFile(diagramResource);

+				return file == null || file.getLocation() == null || !file.getLocation().toFile().exists();

+			}

+		}

+		return super.isDeleted(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public ResourceSetInfo getResourceSetInfo(Object editorInput) {

+		return (ResourceSetInfo) super.getElementInfo(editorInput);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void disposeElementInfo(Object element, ElementInfo info) {

+		if (info instanceof ResourceSetInfo) {

+			ResourceSetInfo resourceSetInfo = (ResourceSetInfo) info;

+			resourceSetInfo.dispose();

+		}

+		super.disposeElementInfo(element, info);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void doValidateState(Object element, Object computationContext) throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			LinkedList<IFile> files2Validate = new LinkedList<IFile>();

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if (file != null && file.isReadOnly()) {

+					files2Validate.add(file);

+				}

+			}

+			ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]),

+					computationContext);

+		}

+

+		super.doValidateState(element, computationContext);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean isReadOnly(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			if (info.isUpdateCache()) {

+				try {

+					updateCache(element);

+				} catch (CoreException ex) {

+					UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_isModifiable, ex);

+					// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable

+				}

+			}

+			return info.isReadOnly();

+		}

+		return super.isReadOnly(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean isModifiable(Object element) {

+		if (!isStateValidated(element)) {

+			if (element instanceof FileEditorInput || element instanceof URIEditorInput) {

+				return true;

+			}

+		}

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			if (info.isUpdateCache()) {

+				try {

+					updateCache(element);

+				} catch (CoreException ex) {

+					UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_isModifiable, ex);

+					// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable

+				}

+			}

+			return info.isModifiable();

+		}

+		return super.isModifiable(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void updateCache(Object element) throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if (file != null && file.isReadOnly()) {

+					info.setReadOnly(true);

+					info.setModifiable(false);

+					return;

+				}

+			}

+			info.setReadOnly(false);

+			info.setModifiable(true);

+			return;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void doUpdateStateCache(Object element) throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			info.setUpdateCache(true);

+		}

+		super.doUpdateStateCache(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean isSynchronized(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			return info.isSynchronized();

+		}

+		return super.isSynchronized(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected ISchedulingRule getResetRule(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if (file != null) {

+					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(file));

+				}

+			}

+			return new MultiRule(rules.toArray(new ISchedulingRule[rules.size()]));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected ISchedulingRule getSaveRule(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if (file != null) {

+					rules.add(computeSchedulingRule(file));

+				}

+			}

+			return new MultiRule(rules.toArray(new ISchedulingRule[rules.size()]));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected ISchedulingRule getSynchronizeRule(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if (file != null) {

+					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().refreshRule(file));

+				}

+			}

+			return new MultiRule(rules.toArray(new ISchedulingRule[rules.size()]));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected ISchedulingRule getValidateStateRule(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			LinkedList<ISchedulingRule> files = new LinkedList<ISchedulingRule>();

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if (file != null) {

+					files.add(file);

+				}

+			}

+			return ResourcesPlugin.getWorkspace().getRuleFactory()

+					.validateEditRule(files.toArray(new IFile[files.size()]));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ISchedulingRule computeSchedulingRule(IResource toCreateOrModify) {

+		if (toCreateOrModify.exists()) {

+			return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(toCreateOrModify);

+		}

+		IResource parent = toCreateOrModify;

+		do {

+			/*

+			 * XXX This is a workaround for

+			 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=67601

+			 * IResourceRuleFactory.createRule should iterate the hierarchy

+			 * itself.

+			 */

+			toCreateOrModify = parent;

+			parent = toCreateOrModify.getParent();

+		} while (parent != null && !parent.exists());

+

+		return ResourcesPlugin.getWorkspace().getRuleFactory().createRule(toCreateOrModify);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				handleElementChanged(info, nextResource, monitor);

+			}

+			return;

+		}

+		super.doSynchronize(element, monitor);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite)

+			throws CoreException {

+		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));

+			}

+			info.stopResourceListening();

+			fireElementStateChanging(element);

+			try {

+				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()));

+					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));

+						}

+					}

+					monitor.worked(1);

+				}

+				monitor.done();

+				info.setModificationStamp(computeModificationStamp(info));

+			} catch (RuntimeException x) {

+				fireElementStateChangeFailed(element);

+				throw x;

+			} finally {

+				info.startResourceListening();

+			}

+		} else {

+			URI newResoruceURI;

+			List<IFile> affectedFiles = null;

+			if (element instanceof FileEditorInput) {

+				IFile newFile = ((FileEditorInput) element).getFile();

+				affectedFiles = Collections.singletonList(newFile);

+				newResoruceURI = URI.createPlatformResourceURI(newFile.getFullPath().toString(), true);

+			} else if (element instanceof URIEditorInput) {

+				newResoruceURI = ((URIEditorInput) element).getURI();

+			} else {

+				fireElementStateChangeFailed(element);

+				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

+						NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError,

+								new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$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 //$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 Diagram diagramCopy = EcoreUtil.copy(diagramDocument.getDiagram());

+			try {

+				new AbstractTransactionalCommand(diagramDocument.getEditingDomain(),

+						NLS.bind(Messages.UMLDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) {

+					@Override

+					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)

+							throws ExecutionException {

+						newResource.getContents().add(diagramCopy);

+						return CommandResult.newOKCommandResult();

+					}

+				}.execute(monitor, null);

+				newResource.save(UMLDiagramEditorUtil.getSaveOptions());

+			} catch (ExecutionException e) {

+				fireElementStateChangeFailed(element);

+				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));

+			}

+			newResource.unload();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleElementChanged(ResourceSetInfo info, Resource changedResource, IProgressMonitor monitor) {

+		IFile file = WorkspaceSynchronizer.getFile(changedResource);

+		if (file != null) {

+			try {

+				file.refreshLocal(IResource.DEPTH_INFINITE, monitor);

+			} catch (CoreException 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

+			}

+		}

+		changedResource.unload();

+

+		fireElementContentAboutToBeReplaced(info.getEditorInput());

+		removeUnchangedElementListeners(info.getEditorInput(), info);

+		info.fStatus = null;

+		try {

+			setDocumentContent(info.fDocument, info.getEditorInput());

+		} catch (CoreException e) {

+			info.fStatus = e.getStatus();

+		}

+		if (!info.fCanBeSaved) {

+			info.setModificationStamp(computeModificationStamp(info));

+		}

+		addUnchangedElementListeners(info.getEditorInput(), info);

+		fireElementContentReplaced(info.getEditorInput());

+	}

+

+	/**

+	 * @generated

+	 */

+	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));

+			fireElementMoved(input, newFile == null ? null : new FileEditorInput(newFile));

+			return;

+		}

+		// TODO: append suffix to the URI! (use diagram as a parameter)

+		fireElementMoved(input, new URIEditorInput(uri));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IEditorInput createInputWithEditingDomain(IEditorInput editorInput, TransactionalEditingDomain domain) {

+		return editorInput;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IDiagramDocument getDiagramDocument(Object element) {

+		IDocument doc = getDocument(element);

+		if (doc instanceof IDiagramDocument) {

+			return (IDiagramDocument) doc;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected class ResourceSetInfo extends ElementInfo {

+

+		/**

+		 * @generated

+		 */

+		private long myModificationStamp = IResource.NULL_STAMP;

+

+		/**

+		 * @generated

+		 */

+		private WorkspaceSynchronizer mySynchronizer;

+

+		/**

+		 * @generated

+		 */

+		private LinkedList<Resource> myUnSynchronizedResources = new LinkedList<Resource>();

+

+		/**

+		 * @generated

+		 */

+		private IDiagramDocument myDocument;

+

+		/**

+		 * @generated

+		 */

+		private IEditorInput myEditorInput;

+

+		/**

+		 * @generated

+		 */

+		private boolean myUpdateCache = true;

+

+		/**

+		 * @generated

+		 */

+		private boolean myModifiable = false;

+

+		/**

+		 * @generated

+		 */

+		private boolean myReadOnly = true;

+

+		/**

+		 * @generated

+		 */

+		private ResourceSetModificationListener myResourceSetListener;

+

+		/**

+		 * @generated

+		 */

+		public ResourceSetInfo(IDiagramDocument document, IEditorInput editorInput) {

+			super(document);

+			myDocument = document;

+			myEditorInput = editorInput;

+			startResourceListening();

+			myResourceSetListener = new ResourceSetModificationListener(this);

+			getResourceSet().eAdapters().add(myResourceSetListener);

+		}

+

+		/**

+		 * @generated

+		 */

+		public long getModificationStamp() {

+			return myModificationStamp;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setModificationStamp(long modificationStamp) {

+			myModificationStamp = modificationStamp;

+		}

+

+		/**

+		 * @generated

+		 */

+		public TransactionalEditingDomain getEditingDomain() {

+			return myDocument.getEditingDomain();

+		}

+

+		/**

+		 * @generated

+		 */

+		public ResourceSet getResourceSet() {

+			return getEditingDomain().getResourceSet();

+		}

+

+		/**

+		 * @generated

+		 */

+		public Iterator<Resource> getLoadedResourcesIterator() {

+			return new ArrayList<Resource>(getResourceSet().getResources()).iterator();

+		}

+

+		/**

+		 * @generated

+		 */

+		public IEditorInput getEditorInput() {

+			return myEditorInput;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void dispose() {

+			stopResourceListening();

+			getResourceSet().eAdapters().remove(myResourceSetListener);

+			for (Iterator<Resource> it = getLoadedResourcesIterator(); it.hasNext();) {

+				Resource resource = it.next();

+				resource.unload();

+			}

+			getEditingDomain().dispose();

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isSynchronized() {

+			return myUnSynchronizedResources.size() == 0;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setUnSynchronized(Resource resource) {

+			myUnSynchronizedResources.add(resource);

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setSynchronized(Resource resource) {

+			myUnSynchronizedResources.remove(resource);

+		}

+

+		/**

+		 * @generated

+		 */

+		public final void stopResourceListening() {

+			mySynchronizer.dispose();

+			mySynchronizer = null;

+		}

+

+		/**

+		 * @generated

+		 */

+		public final void startResourceListening() {

+			mySynchronizer = new WorkspaceSynchronizer(getEditingDomain(), new SynchronizerDelegate());

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isUpdateCache() {

+			return myUpdateCache;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setUpdateCache(boolean update) {

+			myUpdateCache = update;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isModifiable() {

+			return myModifiable;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setModifiable(boolean modifiable) {

+			myModifiable = modifiable;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isReadOnly() {

+			return myReadOnly;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setReadOnly(boolean readOnly) {

+			myReadOnly = readOnly;

+		}

+

+		/**

+		 * @generated

+		 */

+		private class SynchronizerDelegate implements WorkspaceSynchronizer.Delegate {

+

+			/**

+			 * @generated

+			 */

+			@Override

+			public void dispose() {

+			}

+

+			/**

+			 * @generated

+			 */

+			@Override

+			public boolean handleResourceChanged(final Resource resource) {

+				synchronized (ResourceSetInfo.this) {

+					if (ResourceSetInfo.this.fCanBeSaved) {

+						ResourceSetInfo.this.setUnSynchronized(resource);

+						return true;

+					}

+				}

+				Display.getDefault().asyncExec(new Runnable() {

+					@Override

+					public void run() {

+						handleElementChanged(ResourceSetInfo.this, resource, null);

+					}

+				});

+				return true;

+			}

+

+			/**

+			 * @generated

+			 */

+			@Override

+			public boolean handleResourceDeleted(Resource resource) {

+				synchronized (ResourceSetInfo.this) {

+					if (ResourceSetInfo.this.fCanBeSaved) {

+						ResourceSetInfo.this.setUnSynchronized(resource);

+						return true;

+					}

+				}

+				Display.getDefault().asyncExec(new Runnable() {

+					@Override

+					public void run() {

+						fireElementDeleted(ResourceSetInfo.this.getEditorInput());

+					}

+				});

+				return true;

+			}

+

+			/**

+			 * @generated

+			 */

+			@Override

+			public boolean handleResourceMoved(Resource resource, final URI newURI) {

+				synchronized (ResourceSetInfo.this) {

+					if (ResourceSetInfo.this.fCanBeSaved) {

+						ResourceSetInfo.this.setUnSynchronized(resource);

+						return true;

+					}

+				}

+				if (myDocument.getDiagram().eResource() == resource) {

+					Display.getDefault().asyncExec(new Runnable() {

+						@Override

+						public void run() {

+							handleElementMoved(ResourceSetInfo.this.getEditorInput(), newURI);

+						}

+					});

+				} else {

+					handleResourceDeleted(resource);

+				}

+				return true;

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private class ResourceSetModificationListener extends EContentAdapter {

+

+		/**

+		 * @generated

+		 */

+		private NotificationFilter myModifiedFilter;

+

+		/**

+		 * @generated

+		 */

+		private ResourceSetInfo myInfo;

+

+		/**

+		 * @generated

+		 */

+		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));

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public void notifyChanged(Notification notification) {

+			if (notification.getNotifier() instanceof ResourceSet) {

+				super.notifyChanged(notification);

+			}

+			if (!notification.isTouch() && myModifiedFilter.matches(notification)) {

+				if (notification.getNotifier() instanceof Resource) {

+					Resource resource = (Resource) notification.getNotifier();

+					if (resource.isLoaded()) {

+						boolean modified = false;

+						for (Iterator<Resource> it = myInfo.getLoadedResourcesIterator(); it.hasNext() && !modified;) {

+							Resource nextResource = it.next();

+							if (nextResource.isLoaded()) {

+								modified = nextResource.isModified();

+							}

+						}

+						boolean dirtyStateChanged = false;

+						synchronized (myInfo) {

+							if (modified != myInfo.fCanBeSaved) {

+								myInfo.fCanBeSaved = modified;

+								dirtyStateChanged = true;

+							}

+							if (!resource.isModified()) {

+								myInfo.setSynchronized(resource);

+							}

+						}

+						if (dirtyStateChanged) {

+							fireElementDirtyStateChanged(myInfo.getEditorInput(), modified);

+

+							if (!modified) {

+								myInfo.setModificationStamp(computeModificationStamp(myInfo));

+							}

+						}

+					}

+				}

+			}

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLInitDiagramFileAction.java
index 3a50444b54e..96bedc329f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLInitDiagramFileAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLInitDiagramFileAction.java
@@ -1,101 +1,101 @@
-/**
- * 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.component.part;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @generated
- */
-public class UMLInitDiagramFileAction implements IObjectActionDelegate {
-
-	/**
-	 * @generated
-	 */
-	private IWorkbenchPart targetPart;
-
-	/**
-	 * @generated
-	 */
-	private URI domainModelURI;
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		this.targetPart = targetPart;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void selectionChanged(IAction action, ISelection selection) {
-		domainModelURI = null;
-		action.setEnabled(false);
-		if (selection instanceof IStructuredSelection == false || selection.isEmpty()) {
-			return;
-		}
-		IFile file = (IFile) ((IStructuredSelection) selection).getFirstElement();
-		domainModelURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true);
-		action.setEnabled(true);
-	}
-
-	/**
-	 * @generated
-	 */
-	private Shell getShell() {
-		return targetPart.getSite().getShell();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void run(IAction action) {
-		TransactionalEditingDomain editingDomain = WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain();
-		ResourceSet resourceSet = editingDomain.getResourceSet();
-		EObject diagramRoot = null;
-		try {
-			Resource resource = resourceSet.getResource(domainModelURI, true);
-			diagramRoot = resource.getContents().get(0);
-		} catch (WrappedException ex) {
-			UMLDiagramEditorPlugin.getInstance().logError("Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$
-		}
-		if (diagramRoot == null) {
-			MessageDialog.openError(getShell(), Messages.InitDiagramFile_ResourceErrorDialogTitle,
-					Messages.InitDiagramFile_ResourceErrorDialogMessage);
-			return;
-		}
-		Wizard wizard = new UMLNewDiagramFileWizard(domainModelURI, diagramRoot, editingDomain);
-		wizard.setWindowTitle(NLS.bind(Messages.InitDiagramFile_WizardTitle, ComponentDiagramEditPart.MODEL_ID));
-		UMLDiagramEditorUtil.runWizard(getShell(), wizard, "InitDiagramFile"); //$NON-NLS-1$
-	}
-}
+/**

+ * 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.component.part;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.common.util.WrappedException;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IObjectActionDelegate;

+import org.eclipse.ui.IWorkbenchPart;

+

+/**

+ * @generated

+ */

+public class UMLInitDiagramFileAction implements IObjectActionDelegate {

+

+	/**

+	 * @generated

+	 */

+	private IWorkbenchPart targetPart;

+

+	/**

+	 * @generated

+	 */

+	private URI domainModelURI;

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

+		this.targetPart = targetPart;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void selectionChanged(IAction action, ISelection selection) {

+		domainModelURI = null;

+		action.setEnabled(false);

+		if (selection instanceof IStructuredSelection == false || selection.isEmpty()) {

+			return;

+		}

+		IFile file = (IFile) ((IStructuredSelection) selection).getFirstElement();

+		domainModelURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true);

+		action.setEnabled(true);

+	}

+

+	/**

+	 * @generated

+	 */

+	private Shell getShell() {

+		return targetPart.getSite().getShell();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void run(IAction action) {

+		TransactionalEditingDomain editingDomain = WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain();

+		ResourceSet resourceSet = editingDomain.getResourceSet();

+		EObject diagramRoot = null;

+		try {

+			Resource resource = resourceSet.getResource(domainModelURI, true);

+			diagramRoot = resource.getContents().get(0);

+		} catch (WrappedException ex) {

+			UMLDiagramEditorPlugin.getInstance().logError("Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$

+		}

+		if (diagramRoot == null) {

+			MessageDialog.openError(getShell(), Messages.InitDiagramFile_ResourceErrorDialogTitle,

+					Messages.InitDiagramFile_ResourceErrorDialogMessage);

+			return;

+		}

+		Wizard wizard = new UMLNewDiagramFileWizard(domainModelURI, diagramRoot, editingDomain);

+		wizard.setWindowTitle(NLS.bind(Messages.InitDiagramFile_WizardTitle, ComponentDiagramEditPart.MODEL_ID));

+		UMLDiagramEditorUtil.runWizard(getShell(), wizard, "InitDiagramFile"); //$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLLinkDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLLinkDescriptor.java
index 0353f511c47..429528c1018 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLLinkDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLLinkDescriptor.java
@@ -1,37 +1,37 @@
-/**
- * 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.component.part;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.infra.gmfdiag.common.updater.UpdaterLinkDescriptor;
-
-/**
- * @generated
- */
-public class UMLLinkDescriptor extends UpdaterLinkDescriptor {
-
-	/**
-	 * @generated
-	 */
-	public UMLLinkDescriptor(EObject source, EObject destination, IElementType elementType, String linkVID) {
-		super(source, destination, elementType, linkVID);
-	}
-
-	/**
-	 * @generated
-	 */
-	public UMLLinkDescriptor(EObject source, EObject destination, EObject linkElement, IElementType elementType,
-			String linkVID) {
-		super(source, destination, linkElement, elementType, linkVID);
-	}
-}
+/**

+ * 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.component.part;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.papyrus.infra.gmfdiag.common.updater.UpdaterLinkDescriptor;

+

+/**

+ * @generated

+ */

+public class UMLLinkDescriptor extends UpdaterLinkDescriptor {

+

+	/**

+	 * @generated

+	 */

+	public UMLLinkDescriptor(EObject source, EObject destination, IElementType elementType, String linkVID) {

+		super(source, destination, elementType, linkVID);

+	}

+

+	/**

+	 * @generated

+	 */

+	public UMLLinkDescriptor(EObject source, EObject destination, EObject linkElement, IElementType elementType,

+			String linkVID) {

+		super(source, destination, linkElement, elementType, linkVID);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLMatchingStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLMatchingStrategy.java
index 1bbf02872bb..ee6b60d3f4a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLMatchingStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLMatchingStrategy.java
@@ -1,45 +1,45 @@
-/**
- * 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.component.part;
-
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorMatchingStrategy;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.PartInitException;
-
-/**
- * @generated
- */
-public class UMLMatchingStrategy implements IEditorMatchingStrategy {
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean matches(IEditorReference editorRef, IEditorInput input) {
-		IEditorInput editorInput;
-		try {
-			editorInput = editorRef.getEditorInput();
-		} catch (PartInitException e) {
-			return false;
-		}
-
-		if (editorInput.equals(input)) {
-			return true;
-		}
-		if (editorInput instanceof URIEditorInput && input instanceof URIEditorInput) {
-			return ((URIEditorInput) editorInput).getURI().equals(((URIEditorInput) input).getURI());
-		}
-		return false;
-	}
-}
+/**

+ * 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.component.part;

+

+import org.eclipse.emf.common.ui.URIEditorInput;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorMatchingStrategy;

+import org.eclipse.ui.IEditorReference;

+import org.eclipse.ui.PartInitException;

+

+/**

+ * @generated

+ */

+public class UMLMatchingStrategy implements IEditorMatchingStrategy {

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean matches(IEditorReference editorRef, IEditorInput input) {

+		IEditorInput editorInput;

+		try {

+			editorInput = editorRef.getEditorInput();

+		} catch (PartInitException e) {

+			return false;

+		}

+

+		if (editorInput.equals(input)) {

+			return true;

+		}

+		if (editorInput instanceof URIEditorInput && input instanceof URIEditorInput) {

+			return ((URIEditorInput) editorInput).getURI().equals(((URIEditorInput) input).getURI());

+		}

+		return false;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLNewDiagramFileWizard.java
index e1ce1f09552..f031dbd1b3d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLNewDiagramFileWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLNewDiagramFileWizard.java
@@ -1,187 +1,187 @@
-/**
- * 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.component.part;
-
-import java.io.IOException;
-import java.util.LinkedList;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-/**
- * @generated
- */
-public class UMLNewDiagramFileWizard extends Wizard {
-
-	/**
-	 * @generated
-	 */
-	private WizardNewFileCreationPage myFileCreationPage;
-
-	/**
-	 * @generated
-	 */
-	private ModelElementSelectionPage diagramRootElementSelectionPage;
-
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain myEditingDomain;
-
-	/**
-	 * @generated
-	 */
-	public UMLNewDiagramFileWizard(URI domainModelURI, EObject diagramRoot, TransactionalEditingDomain editingDomain) {
-		assert domainModelURI != null : "Domain model uri must be specified"; //$NON-NLS-1$
-		assert diagramRoot != null : "Doagram root element must be specified"; //$NON-NLS-1$
-		assert editingDomain != null : "Editing domain must be specified"; //$NON-NLS-1$
-
-		myFileCreationPage = new WizardNewFileCreationPage(Messages.UMLNewDiagramFileWizard_CreationPageName,
-				StructuredSelection.EMPTY);
-		myFileCreationPage.setTitle(Messages.UMLNewDiagramFileWizard_CreationPageTitle);
-		myFileCreationPage.setDescription(
-				NLS.bind(Messages.UMLNewDiagramFileWizard_CreationPageDescription, ComponentDiagramEditPart.MODEL_ID));
-		IPath filePath;
-		String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment());
-		if (domainModelURI.isPlatformResource()) {
-			filePath = new Path(domainModelURI.trimSegments(1).toPlatformString(true));
-		} else if (domainModelURI.isFile()) {
-			filePath = new Path(domainModelURI.trimSegments(1).toFileString());
-		} else {
-			// TODO : use some default path
-			throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$
-		}
-		myFileCreationPage.setContainerFullPath(filePath);
-		myFileCreationPage
-				.setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "PapyrusUMLComponent_diagram")); //$NON-NLS-1$
-
-		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(
-				Messages.UMLNewDiagramFileWizard_RootSelectionPageName);
-		diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);
-		diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription);
-		diagramRootElementSelectionPage.setModelElement(diagramRoot);
-
-		myEditingDomain = editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void addPages() {
-		addPage(myFileCreationPage);
-		addPage(diagramRootElementSelectionPage);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean performFinish() {
-		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) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-					throws ExecutionException {
-				String diagramVID = UMLVisualIDRegistry
-						.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement());
-				if (diagramVID.equals(ComponentDiagramEditPart.VISUAL_ID)) {
-					return CommandResult.newErrorCommandResult(Messages.UMLNewDiagramFileWizard_IncorrectRootError);
-				}
-				Diagram diagram = ViewService.createDiagram(diagramRootElementSelectionPage.getModelElement(),
-						ComponentDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-				diagramResource.getContents().add(diagram);
-				return CommandResult.newOKCommandResult();
-			}
-		};
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(command, new NullProgressMonitor(), null);
-			diagramResource.save(UMLDiagramEditorUtil.getSaveOptions());
-			UMLDiagramEditorUtil.openDiagram(diagramResource);
-		} catch (ExecutionException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$
-		} catch (IOException ex) {
-			UMLDiagramEditorPlugin.getInstance().logError("Save operation failed for: " + diagramModelURI, ex); //$NON-NLS-1$
-		} catch (PartInitException ex) {
-			UMLDiagramEditorPlugin.getInstance().logError("Unable to open editor", ex); //$NON-NLS-1$
-		}
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class DiagramRootElementSelectionPage extends ModelElementSelectionPage {
-
-		/**
-		 * @generated
-		 */
-		protected DiagramRootElementSelectionPage(String pageName) {
-			super(pageName);
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		protected String getSelectionTitle() {
-			return Messages.UMLNewDiagramFileWizard_RootSelectionPageSelectionTitle;
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		protected boolean validatePage() {
-			if (getModelElement() == null) {
-				setErrorMessage(Messages.UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage);
-				return false;
-			}
-			boolean result = ViewService.getInstance()
-					.provides(new CreateDiagramViewOperation(new EObjectAdapter(getModelElement()),
-							ComponentDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));
-			setErrorMessage(result ? null : Messages.UMLNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage);
-			return result;
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.component.part;

+

+import java.io.IOException;

+import java.util.LinkedList;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.commands.operations.OperationHistoryFactory;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;

+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.viewers.StructuredSelection;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+

+/**

+ * @generated

+ */

+public class UMLNewDiagramFileWizard extends Wizard {

+

+	/**

+	 * @generated

+	 */

+	private WizardNewFileCreationPage myFileCreationPage;

+

+	/**

+	 * @generated

+	 */

+	private ModelElementSelectionPage diagramRootElementSelectionPage;

+

+	/**

+	 * @generated

+	 */

+	private TransactionalEditingDomain myEditingDomain;

+

+	/**

+	 * @generated

+	 */

+	public UMLNewDiagramFileWizard(URI domainModelURI, EObject diagramRoot, TransactionalEditingDomain editingDomain) {

+		assert domainModelURI != null : "Domain model uri must be specified"; //$NON-NLS-1$

+		assert diagramRoot != null : "Doagram root element must be specified"; //$NON-NLS-1$

+		assert editingDomain != null : "Editing domain must be specified"; //$NON-NLS-1$

+

+		myFileCreationPage = new WizardNewFileCreationPage(Messages.UMLNewDiagramFileWizard_CreationPageName,

+				StructuredSelection.EMPTY);

+		myFileCreationPage.setTitle(Messages.UMLNewDiagramFileWizard_CreationPageTitle);

+		myFileCreationPage.setDescription(

+				NLS.bind(Messages.UMLNewDiagramFileWizard_CreationPageDescription, ComponentDiagramEditPart.MODEL_ID));

+		IPath filePath;

+		String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment());

+		if (domainModelURI.isPlatformResource()) {

+			filePath = new Path(domainModelURI.trimSegments(1).toPlatformString(true));

+		} else if (domainModelURI.isFile()) {

+			filePath = new Path(domainModelURI.trimSegments(1).toFileString());

+		} else {

+			// TODO : use some default path

+			throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$

+		}

+		myFileCreationPage.setContainerFullPath(filePath);

+		myFileCreationPage

+				.setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "PapyrusUMLComponent_diagram")); //$NON-NLS-1$

+

+		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(

+				Messages.UMLNewDiagramFileWizard_RootSelectionPageName);

+		diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);

+		diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription);

+		diagramRootElementSelectionPage.setModelElement(diagramRoot);

+

+		myEditingDomain = editingDomain;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void addPages() {

+		addPage(myFileCreationPage);

+		addPage(diagramRootElementSelectionPage);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean performFinish() {

+		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) {

+

+			@Override

+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)

+					throws ExecutionException {

+				String diagramVID = UMLVisualIDRegistry

+						.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement());

+				if (diagramVID.equals(ComponentDiagramEditPart.VISUAL_ID)) {

+					return CommandResult.newErrorCommandResult(Messages.UMLNewDiagramFileWizard_IncorrectRootError);

+				}

+				Diagram diagram = ViewService.createDiagram(diagramRootElementSelectionPage.getModelElement(),

+						ComponentDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				diagramResource.getContents().add(diagram);

+				return CommandResult.newOKCommandResult();

+			}

+		};

+		try {

+			OperationHistoryFactory.getOperationHistory().execute(command, new NullProgressMonitor(), null);

+			diagramResource.save(UMLDiagramEditorUtil.getSaveOptions());

+			UMLDiagramEditorUtil.openDiagram(diagramResource);

+		} catch (ExecutionException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$

+		} catch (IOException ex) {

+			UMLDiagramEditorPlugin.getInstance().logError("Save operation failed for: " + diagramModelURI, ex); //$NON-NLS-1$

+		} catch (PartInitException ex) {

+			UMLDiagramEditorPlugin.getInstance().logError("Unable to open editor", ex); //$NON-NLS-1$

+		}

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class DiagramRootElementSelectionPage extends ModelElementSelectionPage {

+

+		/**

+		 * @generated

+		 */

+		protected DiagramRootElementSelectionPage(String pageName) {

+			super(pageName);

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		protected String getSelectionTitle() {

+			return Messages.UMLNewDiagramFileWizard_RootSelectionPageSelectionTitle;

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		protected boolean validatePage() {

+			if (getModelElement() == null) {

+				setErrorMessage(Messages.UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage);

+				return false;

+			}

+			boolean result = ViewService.getInstance()

+					.provides(new CreateDiagramViewOperation(new EObjectAdapter(getModelElement()),

+							ComponentDiagramEditPart.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.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLNodeDescriptor.java
index 917157c1471..9d70d1d60d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLNodeDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLNodeDescriptor.java
@@ -1,28 +1,28 @@
-/**
- * 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.component.part;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.gmfdiag.common.updater.UpdaterNodeDescriptor;
-
-/**
- * @generated
- */
-public class UMLNodeDescriptor extends UpdaterNodeDescriptor {
-
-	/**
-	 * @generated
-	 */
-	public UMLNodeDescriptor(EObject modelElement, String visualID) {
-		super(modelElement, visualID);
-	}
-}
+/**

+ * 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.component.part;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.infra.gmfdiag.common.updater.UpdaterNodeDescriptor;

+

+/**

+ * @generated

+ */

+public class UMLNodeDescriptor extends UpdaterNodeDescriptor {

+

+	/**

+	 * @generated

+	 */

+	public UMLNodeDescriptor(EObject modelElement, String visualID) {

+		super(modelElement, visualID);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java
index bb0ba7ce9e5..66c92058774 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java
@@ -1,444 +1,444 @@
-/**
- * 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.component.part;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;
-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class UMLPaletteFactory extends PaletteFactory.Adapter {
-
-	// RS: New Palette generation
-	// Generates the ID for the tool elements
-	// Generate the tool factory (if(ID) createtool...)
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_CONSTRAINT = "component.tool.constraint";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_COMMENT = "component.tool.comment";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_COMPONENT = "component.tool.component";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_INTERFACE = "component.tool.interface";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_MODEL = "component.tool.model";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_PROPERTY = "component.tool.property";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_OPERATION = "component.tool.operation";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_PACKAGE = "component.tool.package";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_PORT = "component.tool.port";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_RECEPTION = "component.tool.reception";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_LINK = "component.tool.link";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_CONNECTOR = "component.tool.connector";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_DEPENDENCY = "component.tool.dependency";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_DEPENDENCYBRANCH = "component.tool.dependencybranch";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_ABSTRACTION = "component.tool.abstraction";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_MANIFESTATION = "component.tool.manifestation";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_GENERALIZATION = "component.tool.generalization";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_USAGE = "component.tool.usage";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_SUBSTITUTION = "component.tool.substitution";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_INTERFACEREALIZATION = "component.tool.interfaceRealization";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private final static String COMPONENT_TOOL_COMPONENTREALIZATION = "component.tool.componentRealization";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public UMLPaletteFactory() {
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public Tool createTool(String toolId) {
-		if (toolId.equals(COMPONENT_TOOL_CONSTRAINT)) {
-			return createConstraintCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_COMMENT)) {
-			return createCommentCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_COMPONENT)) {
-			return createComponentCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_INTERFACE)) {
-			return createRectancleInterfaceCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_MODEL)) {
-			return createModelCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_PROPERTY)) {
-			return createPropertyCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_OPERATION)) {
-			return createOperationCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_PACKAGE)) {
-			return createPackageCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_PORT)) {
-			return createPortCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_RECEPTION)) {
-			return createReceptionCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_LINK)) {
-			return createLinkCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_CONNECTOR)) {
-			return createConnectorCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_DEPENDENCY)) {
-			return createDependencyCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_DEPENDENCYBRANCH)) {
-			return createDependencyBranchCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_ABSTRACTION)) {
-			return createAbstractionCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_MANIFESTATION)) {
-			return createManifestationCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_GENERALIZATION)) {
-			return createGeneralizationCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_USAGE)) {
-			return createUsageCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_SUBSTITUTION)) {
-			return createSubstitutionCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_INTERFACEREALIZATION)) {
-			return createInterfaceRealizationCreationTool();
-		}
-		if (toolId.equals(COMPONENT_TOOL_COMPONENTREALIZATION)) {
-			return createComponentRealizationCreationTool();
-		}
-		// default return: null
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public Object getTemplate(String templateId) {
-
-		// default return: null
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createConstraintCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Constraint_Shape);
-		types.add(UMLElementTypes.Constraint_Shape_CN);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createCommentCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Comment_Shape);
-		types.add(UMLElementTypes.Comment_Shape_CN);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createComponentCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(3);
-		types.add(UMLElementTypes.Component_PackagedElementShape);
-		types.add(UMLElementTypes.Component_PackagedElementShape_CCN);
-		types.add(UMLElementTypes.Component_PackagedElementShape_CN);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createRectancleInterfaceCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Interface_ClassifierShape);
-		types.add(UMLElementTypes.Interface_ClassifierShape_CN);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createModelCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Model_Shape_CN);
-		types.add(UMLElementTypes.Model_Shape);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createPropertyCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Property_InterfaceAttributeLabel);
-		types.add(UMLElementTypes.Property_Shape);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createOperationCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Operation_InterfaceOperationLabel);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createPackageCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Package_Shape);
-		types.add(UMLElementTypes.Package_Shape_CN);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createPortCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Port_Shape);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createReceptionCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Reception_InterfaceReceptionLabel);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createLinkCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Comment_AnnotatedElementEdge);
-		types.add(UMLElementTypes.Constraint_ConstrainedElementEdge);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createConnectorCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Connector_Edge);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createDependencyCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Dependency_Edge);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createDependencyBranchCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Dependency_BranchEdge);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createAbstractionCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Abstraction_Edge);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createManifestationCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Manifestation_Edge);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createGeneralizationCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Generalization_Edge);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createUsageCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Usage_Edge);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createSubstitutionCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Substitution_Edge);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createInterfaceRealizationCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.InterfaceRealization_Edge);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createComponentRealizationCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.ComponentRealization_Edge);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-}
+/**

+ * 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.component.part;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.gef.Tool;

+import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class UMLPaletteFactory extends PaletteFactory.Adapter {

+

+	// RS: New Palette generation

+	// Generates the ID for the tool elements

+	// Generate the tool factory (if(ID) createtool...)

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_CONSTRAINT = "component.tool.constraint";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_COMMENT = "component.tool.comment";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_COMPONENT = "component.tool.component";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_INTERFACE = "component.tool.interface";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_MODEL = "component.tool.model";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_PROPERTY = "component.tool.property";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_OPERATION = "component.tool.operation";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_PACKAGE = "component.tool.package";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_PORT = "component.tool.port";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_RECEPTION = "component.tool.reception";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_LINK = "component.tool.link";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_CONNECTOR = "component.tool.connector";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_DEPENDENCY = "component.tool.dependency";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_DEPENDENCYBRANCH = "component.tool.dependencybranch";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_ABSTRACTION = "component.tool.abstraction";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_MANIFESTATION = "component.tool.manifestation";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_GENERALIZATION = "component.tool.generalization";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_USAGE = "component.tool.usage";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_SUBSTITUTION = "component.tool.substitution";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_INTERFACEREALIZATION = "component.tool.interfaceRealization";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPONENT_TOOL_COMPONENTREALIZATION = "component.tool.componentRealization";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public UMLPaletteFactory() {

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public Tool createTool(String toolId) {

+		if (toolId.equals(COMPONENT_TOOL_CONSTRAINT)) {

+			return createConstraintCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_COMMENT)) {

+			return createCommentCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_COMPONENT)) {

+			return createComponentCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_INTERFACE)) {

+			return createRectancleInterfaceCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_MODEL)) {

+			return createModelCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_PROPERTY)) {

+			return createPropertyCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_OPERATION)) {

+			return createOperationCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_PACKAGE)) {

+			return createPackageCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_PORT)) {

+			return createPortCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_RECEPTION)) {

+			return createReceptionCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_LINK)) {

+			return createLinkCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_CONNECTOR)) {

+			return createConnectorCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_DEPENDENCY)) {

+			return createDependencyCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_DEPENDENCYBRANCH)) {

+			return createDependencyBranchCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_ABSTRACTION)) {

+			return createAbstractionCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_MANIFESTATION)) {

+			return createManifestationCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_GENERALIZATION)) {

+			return createGeneralizationCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_USAGE)) {

+			return createUsageCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_SUBSTITUTION)) {

+			return createSubstitutionCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_INTERFACEREALIZATION)) {

+			return createInterfaceRealizationCreationTool();

+		}

+		if (toolId.equals(COMPONENT_TOOL_COMPONENTREALIZATION)) {

+			return createComponentRealizationCreationTool();

+		}

+		// default return: null

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public Object getTemplate(String templateId) {

+

+		// default return: null

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createConstraintCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Constraint_Shape);

+		types.add(UMLElementTypes.Constraint_Shape_CN);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createCommentCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Comment_Shape);

+		types.add(UMLElementTypes.Comment_Shape_CN);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createComponentCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(3);

+		types.add(UMLElementTypes.Component_PackagedElementShape);

+		types.add(UMLElementTypes.Component_PackagedElementShape_CCN);

+		types.add(UMLElementTypes.Component_PackagedElementShape_CN);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createRectancleInterfaceCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Interface_ClassifierShape);

+		types.add(UMLElementTypes.Interface_ClassifierShape_CN);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createModelCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Model_Shape_CN);

+		types.add(UMLElementTypes.Model_Shape);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createPropertyCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Property_InterfaceAttributeLabel);

+		types.add(UMLElementTypes.Property_Shape);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createOperationCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Operation_InterfaceOperationLabel);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createPackageCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Package_Shape);

+		types.add(UMLElementTypes.Package_Shape_CN);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createPortCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Port_Shape);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createReceptionCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Reception_InterfaceReceptionLabel);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createLinkCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Comment_AnnotatedElementEdge);

+		types.add(UMLElementTypes.Constraint_ConstrainedElementEdge);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createConnectorCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Connector_Edge);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createDependencyCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Dependency_Edge);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createDependencyBranchCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Dependency_BranchEdge);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createAbstractionCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Abstraction_Edge);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createManifestationCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Manifestation_Edge);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createGeneralizationCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Generalization_Edge);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createUsageCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Usage_Edge);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createSubstitutionCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Substitution_Edge);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createInterfaceRealizationCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.InterfaceRealization_Edge);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createComponentRealizationCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.ComponentRealization_Edge);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLVisualIDRegistry.java
index b6cdccb3522..082cef15482 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/UMLVisualIDRegistry.java
@@ -893,7 +893,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);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/ValidateAction.java
index bf7f9a00acc..d204e23520e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/ValidateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/part/ValidateAction.java
@@ -1,287 +1,287 @@
-/**
- * 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.component.part;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.Diagnostician;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.emf.validation.model.EvaluationMode;
-import org.eclipse.emf.validation.model.IConstraintStatus;
-import org.eclipse.emf.validation.service.IBatchValidator;
-import org.eclipse.emf.validation.service.ModelValidationService;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gmf.runtime.diagram.ui.OffscreenEditPartFactory;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLMarkerNavigationProvider;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLValidationProvider;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
-
-/**
- * @generated
- */
-public class ValidateAction extends Action {
-
-	/**
-	 * @generated
-	 */
-	private IWorkbenchPage page;
-
-	/**
-	 * @generated
-	 */
-	public ValidateAction(IWorkbenchPage page) {
-		setText(Messages.ValidateActionMessage);
-		this.page = page;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void run() {
-		IWorkbenchPart workbenchPart = page.getActivePart();
-		if (workbenchPart instanceof IDiagramWorkbenchPart) {
-			final IDiagramWorkbenchPart part = (IDiagramWorkbenchPart) workbenchPart;
-			try {
-				new WorkspaceModifyDelegatingOperation(new IRunnableWithProgress() {
-
-					@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$
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void runValidation(View view) {
-		try {
-			if (UMLDiagramEditorUtil.openDiagram(view.eResource())) {
-				IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-						.getActiveEditor();
-				if (editorPart instanceof IDiagramWorkbenchPart) {
-					runValidation(((IDiagramWorkbenchPart) editorPart).getDiagramEditPart(), view);
-				} else {
-					runNonUIValidation(view);
-				}
-			}
-		} catch (Exception e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Validation action failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void runNonUIValidation(View view) {
-		Shell shell = Display.getCurrent().getActiveShell();
-		if (shell == null) {
-			shell = new Shell();
-		}
-
-		DiagramEditPart diagramEditPart = OffscreenEditPartFactory.getInstance()
-				.createDiagramEditPart(view.getDiagram(), shell);
-		runValidation(diagramEditPart, view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void runValidation(DiagramEditPart diagramEditPart, View view) {
-		final DiagramEditPart fpart = diagramEditPart;
-		final View fview = view;
-		TransactionalEditingDomain txDomain = TransactionUtil.getEditingDomain(view);
-		UMLValidationProvider.runWithConstraints(txDomain, new Runnable() {
-
-			@Override
-			public void run() {
-				validate(fpart, fview);
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Diagnostic runEMFValidator(View target) {
-		if (target.isSetElement() && target.getElement() != null) {
-			return new Diagnostician() {
-
-				@Override
-				public String getObjectLabel(EObject eObject) {
-					return EMFCoreUtil.getQualifiedName(eObject, true);
-				}
-			}.validate(target.getElement());
-		}
-		return Diagnostic.OK_INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static void validate(DiagramEditPart diagramEditPart, View view) {
-		IFile target = view.eResource() != null ? WorkspaceSynchronizer.getFile(view.eResource()) : null;
-		if (target != null) {
-			UMLMarkerNavigationProvider.deleteMarkers(target);
-		}
-		Diagnostic diagnostic = runEMFValidator(view);
-		createMarkers(target, diagnostic, diagramEditPart);
-		IBatchValidator validator = (IBatchValidator) ModelValidationService.getInstance()
-				.newValidator(EvaluationMode.BATCH);
-		validator.setIncludeLiveConstraints(true);
-		if (view.isSetElement() && view.getElement() != null) {
-			IStatus status = validator.validate(view.getElement());
-			createMarkers(target, status, diagramEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static void createMarkers(IFile target, IStatus validationStatus, DiagramEditPart diagramEditPart) {
-		if (validationStatus.isOK()) {
-			return;
-		}
-		final IStatus rootStatus = validationStatus;
-		List allStatuses = new ArrayList();
-		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(
-				diagramEditPart.getDiagramView(),
-				collectTargetElements(rootStatus, new HashSet<EObject>(), allStatuses));
-		for (Iterator it = allStatuses.iterator(); it.hasNext();) {
-			IConstraintStatus nextStatus = (IConstraintStatus) it.next();
-			View view = UMLDiagramEditorUtil.findView(diagramEditPart, nextStatus.getTarget(), element2ViewMap);
-			addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view),
-					EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true), nextStatus.getMessage(),
-					nextStatus.getSeverity());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static void createMarkers(IFile target, Diagnostic emfValidationStatus, DiagramEditPart diagramEditPart) {
-		if (emfValidationStatus.getSeverity() == Diagnostic.OK) {
-			return;
-		}
-		final Diagnostic rootStatus = emfValidationStatus;
-		List<Diagnostic> allDiagnostics = new ArrayList<Diagnostic>();
-		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(
-				diagramEditPart.getDiagramView(),
-				collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics));
-		for (Iterator<Diagnostic> it = emfValidationStatus.getChildren().iterator(); it.hasNext();) {
-			Diagnostic nextDiagnostic = it.next();
-			List<?> data = nextDiagnostic.getData();
-			if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) {
-				EObject element = (EObject) data.get(0);
-				View view = UMLDiagramEditorUtil.findView(diagramEditPart, element, element2ViewMap);
-				addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view),
-						EMFCoreUtil.getQualifiedName(element, true), nextDiagnostic.getMessage(),
-						diagnosticToStatusSeverity(nextDiagnostic.getSeverity()));
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	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);
-	}
-
-	/**
-	 * @generated
-	 */
-	private static int diagnosticToStatusSeverity(int diagnosticSeverity) {
-		if (diagnosticSeverity == Diagnostic.OK) {
-			return IStatus.OK;
-		} else if (diagnosticSeverity == Diagnostic.INFO) {
-			return IStatus.INFO;
-		} else if (diagnosticSeverity == Diagnostic.WARNING) {
-			return IStatus.WARNING;
-		} else if (diagnosticSeverity == Diagnostic.ERROR || diagnosticSeverity == Diagnostic.CANCEL) {
-			return IStatus.ERROR;
-		}
-		return IStatus.INFO;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Set<EObject> collectTargetElements(IStatus status, Set<EObject> targetElementCollector,
-			List<IConstraintStatus> allConstraintStatuses) {
-		if (status instanceof IConstraintStatus) {
-			targetElementCollector.add(((IConstraintStatus) status).getTarget());
-			allConstraintStatuses.add((IConstraintStatus) status);
-		}
-		if (status.isMultiStatus()) {
-			IStatus[] children = status.getChildren();
-			for (int i = 0; i < children.length; i++) {
-				collectTargetElements(children[i], targetElementCollector, allConstraintStatuses);
-			}
-		}
-		return targetElementCollector;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Set<EObject> collectTargetElements(Diagnostic diagnostic, Set<EObject> targetElementCollector,
-			List<Diagnostic> allDiagnostics) {
-		List<?> data = diagnostic.getData();
-		EObject target = null;
-		if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) {
-			target = (EObject) data.get(0);
-			targetElementCollector.add(target);
-			allDiagnostics.add(diagnostic);
-		}
-		if (diagnostic.getChildren() != null && !diagnostic.getChildren().isEmpty()) {
-			for (Iterator<Diagnostic> it = diagnostic.getChildren().iterator(); it.hasNext();) {
-				collectTargetElements(it.next(), targetElementCollector, allDiagnostics);
-			}
-		}
-		return targetElementCollector;
-	}
-}
+/**

+ * 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.component.part;

+

+import java.lang.reflect.InvocationTargetException;

+import java.util.ArrayList;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.emf.common.util.Diagnostic;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.util.Diagnostician;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.emf.validation.model.EvaluationMode;

+import org.eclipse.emf.validation.model.IConstraintStatus;

+import org.eclipse.emf.validation.service.IBatchValidator;

+import org.eclipse.emf.validation.service.ModelValidationService;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gmf.runtime.diagram.ui.OffscreenEditPartFactory;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;

+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.operation.IRunnableWithProgress;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLMarkerNavigationProvider;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLValidationProvider;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;

+

+/**

+ * @generated

+ */

+public class ValidateAction extends Action {

+

+	/**

+	 * @generated

+	 */

+	private IWorkbenchPage page;

+

+	/**

+	 * @generated

+	 */

+	public ValidateAction(IWorkbenchPage page) {

+		setText(Messages.ValidateActionMessage);

+		this.page = page;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void run() {

+		IWorkbenchPart workbenchPart = page.getActivePart();

+		if (workbenchPart instanceof IDiagramWorkbenchPart) {

+			final IDiagramWorkbenchPart part = (IDiagramWorkbenchPart) workbenchPart;

+			try {

+				new WorkspaceModifyDelegatingOperation(new IRunnableWithProgress() {

+

+					@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$

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void runValidation(View view) {

+		try {

+			if (UMLDiagramEditorUtil.openDiagram(view.eResource())) {

+				IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()

+						.getActiveEditor();

+				if (editorPart instanceof IDiagramWorkbenchPart) {

+					runValidation(((IDiagramWorkbenchPart) editorPart).getDiagramEditPart(), view);

+				} else {

+					runNonUIValidation(view);

+				}

+			}

+		} catch (Exception e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Validation action failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void runNonUIValidation(View view) {

+		Shell shell = Display.getCurrent().getActiveShell();

+		if (shell == null) {

+			shell = new Shell();

+		}

+

+		DiagramEditPart diagramEditPart = OffscreenEditPartFactory.getInstance()

+				.createDiagramEditPart(view.getDiagram(), shell);

+		runValidation(diagramEditPart, view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void runValidation(DiagramEditPart diagramEditPart, View view) {

+		final DiagramEditPart fpart = diagramEditPart;

+		final View fview = view;

+		TransactionalEditingDomain txDomain = TransactionUtil.getEditingDomain(view);

+		UMLValidationProvider.runWithConstraints(txDomain, new Runnable() {

+

+			@Override

+			public void run() {

+				validate(fpart, fview);

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Diagnostic runEMFValidator(View target) {

+		if (target.isSetElement() && target.getElement() != null) {

+			return new Diagnostician() {

+

+				@Override

+				public String getObjectLabel(EObject eObject) {

+					return EMFCoreUtil.getQualifiedName(eObject, true);

+				}

+			}.validate(target.getElement());

+		}

+		return Diagnostic.OK_INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static void validate(DiagramEditPart diagramEditPart, View view) {

+		IFile target = view.eResource() != null ? WorkspaceSynchronizer.getFile(view.eResource()) : null;

+		if (target != null) {

+			UMLMarkerNavigationProvider.deleteMarkers(target);

+		}

+		Diagnostic diagnostic = runEMFValidator(view);

+		createMarkers(target, diagnostic, diagramEditPart);

+		IBatchValidator validator = (IBatchValidator) ModelValidationService.getInstance()

+				.newValidator(EvaluationMode.BATCH);

+		validator.setIncludeLiveConstraints(true);

+		if (view.isSetElement() && view.getElement() != null) {

+			IStatus status = validator.validate(view.getElement());

+			createMarkers(target, status, diagramEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private static void createMarkers(IFile target, IStatus validationStatus, DiagramEditPart diagramEditPart) {

+		if (validationStatus.isOK()) {

+			return;

+		}

+		final IStatus rootStatus = validationStatus;

+		List allStatuses = new ArrayList();

+		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(

+				diagramEditPart.getDiagramView(),

+				collectTargetElements(rootStatus, new HashSet<EObject>(), allStatuses));

+		for (Iterator it = allStatuses.iterator(); it.hasNext();) {

+			IConstraintStatus nextStatus = (IConstraintStatus) it.next();

+			View view = UMLDiagramEditorUtil.findView(diagramEditPart, nextStatus.getTarget(), element2ViewMap);

+			addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view),

+					EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true), nextStatus.getMessage(),

+					nextStatus.getSeverity());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private static void createMarkers(IFile target, Diagnostic emfValidationStatus, DiagramEditPart diagramEditPart) {

+		if (emfValidationStatus.getSeverity() == Diagnostic.OK) {

+			return;

+		}

+		final Diagnostic rootStatus = emfValidationStatus;

+		List<Diagnostic> allDiagnostics = new ArrayList<Diagnostic>();

+		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(

+				diagramEditPart.getDiagramView(),

+				collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics));

+		for (Iterator<Diagnostic> it = emfValidationStatus.getChildren().iterator(); it.hasNext();) {

+			Diagnostic nextDiagnostic = it.next();

+			List<?> data = nextDiagnostic.getData();

+			if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) {

+				EObject element = (EObject) data.get(0);

+				View view = UMLDiagramEditorUtil.findView(diagramEditPart, element, element2ViewMap);

+				addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view),

+						EMFCoreUtil.getQualifiedName(element, true), nextDiagnostic.getMessage(),

+						diagnosticToStatusSeverity(nextDiagnostic.getSeverity()));

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	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);

+	}

+

+	/**

+	 * @generated

+	 */

+	private static int diagnosticToStatusSeverity(int diagnosticSeverity) {

+		if (diagnosticSeverity == Diagnostic.OK) {

+			return IStatus.OK;

+		} else if (diagnosticSeverity == Diagnostic.INFO) {

+			return IStatus.INFO;

+		} else if (diagnosticSeverity == Diagnostic.WARNING) {

+			return IStatus.WARNING;

+		} else if (diagnosticSeverity == Diagnostic.ERROR || diagnosticSeverity == Diagnostic.CANCEL) {

+			return IStatus.ERROR;

+		}

+		return IStatus.INFO;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Set<EObject> collectTargetElements(IStatus status, Set<EObject> targetElementCollector,

+			List<IConstraintStatus> allConstraintStatuses) {

+		if (status instanceof IConstraintStatus) {

+			targetElementCollector.add(((IConstraintStatus) status).getTarget());

+			allConstraintStatuses.add((IConstraintStatus) status);

+		}

+		if (status.isMultiStatus()) {

+			IStatus[] children = status.getChildren();

+			for (int i = 0; i < children.length; i++) {

+				collectTargetElements(children[i], targetElementCollector, allConstraintStatuses);

+			}

+		}

+		return targetElementCollector;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Set<EObject> collectTargetElements(Diagnostic diagnostic, Set<EObject> targetElementCollector,

+			List<Diagnostic> allDiagnostics) {

+		List<?> data = diagnostic.getData();

+		EObject target = null;

+		if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) {

+			target = (EObject) data.get(0);

+			targetElementCollector.add(target);

+			allDiagnostics.add(diagnostic);

+		}

+		if (diagnostic.getChildren() != null && !diagnostic.getChildren().isEmpty()) {

+			for (Iterator<Diagnostic> it = diagnostic.getChildren().iterator(); it.hasNext();) {

+				collectTargetElements(it.next(), targetElementCollector, allDiagnostics);

+			}

+		}

+		return targetElementCollector;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramConnectionsPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramConnectionsPreferencePage.java
index 7245603f7ae..7a85ba651ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramConnectionsPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramConnectionsPreferencePage.java
@@ -1,28 +1,28 @@
-/**
- * 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.component.preferences;
-
-import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DiagramConnectionsPreferencePage extends ConnectionsPreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public DiagramConnectionsPreferencePage() {
-		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());
-	}
-}
+/**

+ * 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.component.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramConnectionsPreferencePage extends ConnectionsPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramConnectionsPreferencePage() {

+		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramGeneralPreferencePage.java
index 98c8004e11b..73f401a4624 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramGeneralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramGeneralPreferencePage.java
@@ -1,30 +1,30 @@
-/**
- * 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.component.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DiagramGeneralPreferencePage extends DiagramPreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public DiagramGeneralPreferencePage() {
-		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());
-		setPreferenceKey(ComponentDiagramEditPart.MODEL_ID);
-	}
-}
+/**

+ * 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.component.preferences;

+

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramGeneralPreferencePage extends DiagramPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramGeneralPreferencePage() {

+		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());

+		setPreferenceKey(ComponentDiagramEditPart.MODEL_ID);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramPreferenceInitializer.java
index be3f3d9fe5d..a7be5b1a7e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramPreferenceInitializer.java
@@ -1,48 +1,48 @@
-/**
- * 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.component.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = getPreferenceStore();
-		DiagramGeneralPreferencePage.initDefaults(store);
-		DiagramAppearancePreferencePage.initDefaults(store);
-		DiagramConnectionsPreferencePage.initDefaults(store);
-		DiagramPrintingPreferencePage.initDefaults(store);
-		DiagramRulersAndGridPreferencePage.initDefaults(store);
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IPreferenceStore getPreferenceStore() {
-		return UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
-	}
-}
+/**

+ * 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.component.preferences;

+

+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

+import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;

+import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;

+import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage;

+import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

+import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer {

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void initializeDefaultPreferences() {

+		IPreferenceStore store = getPreferenceStore();

+		DiagramGeneralPreferencePage.initDefaults(store);

+		DiagramAppearancePreferencePage.initDefaults(store);

+		DiagramConnectionsPreferencePage.initDefaults(store);

+		DiagramPrintingPreferencePage.initDefaults(store);

+		DiagramRulersAndGridPreferencePage.initDefaults(store);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IPreferenceStore getPreferenceStore() {

+		return UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramPrintingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramPrintingPreferencePage.java
index 9b8e9e62352..776aff7a29b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramPrintingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramPrintingPreferencePage.java
@@ -1,28 +1,28 @@
-/**
- * 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.component.preferences;
-
-import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DiagramPrintingPreferencePage extends PrintingPreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public DiagramPrintingPreferencePage() {
-		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());
-	}
-}
+/**

+ * 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.component.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramPrintingPreferencePage extends PrintingPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramPrintingPreferencePage() {

+		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramRulersAndGridPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramRulersAndGridPreferencePage.java
index 11a6db8c0a3..60b5d5c4211 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramRulersAndGridPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramRulersAndGridPreferencePage.java
@@ -1,28 +1,28 @@
-/**
- * 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.component.preferences;
-
-import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DiagramRulersAndGridPreferencePage extends RulerGridPreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public DiagramRulersAndGridPreferencePage() {
-		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());
-	}
-}
+/**

+ * 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.component.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramRulersAndGridPreferencePage extends RulerGridPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramRulersAndGridPreferencePage() {

+		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/ElementInitializers.java
index 9f22ecd5c98..15cd0319f63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/ElementInitializers.java
@@ -1,637 +1,637 @@
-/**
- * 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.component.providers;
-
-import org.eclipse.papyrus.uml.diagram.component.expressions.UMLOCLFactory;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.ComponentRealization;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.InterfaceRealization;
-import org.eclipse.uml2.uml.LiteralString;
-import org.eclipse.uml2.uml.Manifestation;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Reception;
-import org.eclipse.uml2.uml.Substitution;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.Usage;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * @generated
- */
-public class ElementInitializers {
-
-	protected ElementInitializers() {
-		// use #getInstance to access cached instance
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Component_PackagedElementShape(Component instance) {
-		try {
-			Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getComponent(), null)
-					.evaluate(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Model_Shape(Model instance) {
-		try {
-			Object value_0 = name_Model_Shape(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Package_Shape(Package instance) {
-		try {
-			Object value_0 = UMLOCLFactory.getExpression(5, UMLPackage.eINSTANCE.getPackage(), null).evaluate(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interface_ClassifierShape(Interface instance) {
-		try {
-			Object value_0 = name_Interface_ClassifierShape(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Comment_Shape(Comment instance) {
-		try {
-			Object value_0 = body_Comment_Shape(instance);
-			if (value_0 != null) {
-				instance.setBody((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Constraint_Shape(Constraint instance) {
-		try {
-			Object value_0 = name_Constraint_Shape(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = specification_Constraint_Shape(instance);
-			if (value_1 != null) {
-				instance.setSpecification((ValueSpecification) value_1);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interface_Shape(Interface instance) {
-		try {
-			Object value_0 = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getInterface(), null)
-					.evaluate(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Port_Shape(Port instance) {
-		try {
-			Object value_0 = UMLOCLFactory.getExpression(1, UMLPackage.eINSTANCE.getPort(), null).evaluate(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			instance.setAggregation(AggregationKind.COMPOSITE_LITERAL);
-
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Model_Shape_CN(Model instance) {
-		try {
-			Object value_0 = name_Model_Shape_CN(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Package_Shape_CN(Package instance) {
-		try {
-			Object value_0 = UMLOCLFactory.getExpression(5, UMLPackage.eINSTANCE.getPackage(), null).evaluate(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interface_ClassifierShape_CN(Interface instance) {
-		try {
-			Object value_0 = name_Interface_ClassifierShape_CN(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Component_PackagedElementShape_CCN(Component instance) {
-		try {
-			Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getComponent(), null)
-					.evaluate(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Component_PackagedElementShape_CN(Component instance) {
-		try {
-			Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getComponent(), null)
-					.evaluate(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Comment_Shape_CN(Comment instance) {
-		try {
-			Object value_0 = body_Comment_Shape_CN(instance);
-			if (value_0 != null) {
-				instance.setBody((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Constraint_Shape_CN(Constraint instance) {
-		try {
-			Object value_0 = name_Constraint_Shape_CN(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = specification_Constraint_Shape_CN(instance);
-			if (value_1 != null) {
-				instance.setSpecification((ValueSpecification) value_1);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Property_InterfaceAttributeLabel(Property instance) {
-		try {
-			Object value_0 = name_Property_InterfaceAttributeLabel(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Operation_InterfaceOperationLabel(Operation instance) {
-		try {
-			Object value_0 = name_Operation_InterfaceOperationLabel(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Reception_InterfaceReceptionLabel(Reception instance) {
-		try {
-			Object value_0 = name_Reception_InterfaceReceptionLabel(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interface_Shape_CN(Interface instance) {
-		try {
-			Object value_0 = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getInterface(), null)
-					.evaluate(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Property_Shape(Property instance) {
-		try {
-			Object value_0 = name_Property_Shape(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Usage_Edge(Usage instance) {
-		try {
-			Object value_0 = UMLOCLFactory.getExpression(3, UMLPackage.eINSTANCE.getUsage(), null).evaluate(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InterfaceRealization_Edge(InterfaceRealization instance) {
-		try {
-			Object value_0 = UMLOCLFactory.getExpression(4, UMLPackage.eINSTANCE.getInterfaceRealization(), null)
-					.evaluate(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Substitution_Edge(Substitution instance) {
-		try {
-			Object value_0 = name_Substitution_Edge(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Manifestation_Edge(Manifestation instance) {
-		try {
-			Object value_0 = name_Manifestation_Edge(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ComponentRealization_Edge(ComponentRealization instance) {
-		try {
-			Object value_0 = name_ComponentRealization_Edge(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Abstraction_Edge(Abstraction instance) {
-		try {
-			Object value_0 = name_Abstraction_Edge(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Dependency_Edge(Dependency instance) {
-		try {
-			Object value_0 = name_Dependency_Edge(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Dependency_BranchEdge(Dependency instance) {
-		try {
-			Object value_0 = name_Dependency_BranchEdge(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Connector_Edge(Connector instance) {
-		try {
-			Object value_0 = name_Connector_Edge(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Model_Shape(Model it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interface_ClassifierShape(Interface it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String body_Comment_Shape(Comment it) {
-		// Comment body init
-		return "";
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Constraint_Shape(Constraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_Constraint_Shape(Constraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Model_Shape_CN(Model it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interface_ClassifierShape_CN(Interface it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String body_Comment_Shape_CN(Comment it) {
-		// Comment body init
-		return "";
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Constraint_Shape_CN(Constraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_Constraint_Shape_CN(Constraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Property_InterfaceAttributeLabel(Property it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Operation_InterfaceOperationLabel(Operation it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Reception_InterfaceReceptionLabel(Reception it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Property_Shape(Property it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Substitution_Edge(Substitution it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Manifestation_Edge(Manifestation it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ComponentRealization_Edge(ComponentRealization it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Abstraction_Edge(Abstraction it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Dependency_Edge(Dependency it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Dependency_BranchEdge(Dependency it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Connector_Edge(Connector it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	public static ElementInitializers getInstance() {
-		ElementInitializers cached = UMLDiagramEditorPlugin.getInstance().getElementInitializers();
-		if (cached == null) {
-			UMLDiagramEditorPlugin.getInstance().setElementInitializers(cached = new ElementInitializers());
-		}
-		return cached;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.component.providers;

+

+import org.eclipse.papyrus.uml.diagram.component.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

+import org.eclipse.uml2.uml.Abstraction;

+import org.eclipse.uml2.uml.AggregationKind;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.ComponentRealization;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.Interface;

+import org.eclipse.uml2.uml.InterfaceRealization;

+import org.eclipse.uml2.uml.LiteralString;

+import org.eclipse.uml2.uml.Manifestation;

+import org.eclipse.uml2.uml.Model;

+import org.eclipse.uml2.uml.Operation;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.Port;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.Reception;

+import org.eclipse.uml2.uml.Substitution;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+import org.eclipse.uml2.uml.Usage;

+import org.eclipse.uml2.uml.ValueSpecification;

+

+/**

+ * @generated

+ */

+public class ElementInitializers {

+

+	protected ElementInitializers() {

+		// use #getInstance to access cached instance

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Component_PackagedElementShape(Component instance) {

+		try {

+			Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getComponent(), null)

+					.evaluate(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Model_Shape(Model instance) {

+		try {

+			Object value_0 = name_Model_Shape(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Package_Shape(Package instance) {

+		try {

+			Object value_0 = UMLOCLFactory.getExpression(5, UMLPackage.eINSTANCE.getPackage(), null).evaluate(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interface_ClassifierShape(Interface instance) {

+		try {

+			Object value_0 = name_Interface_ClassifierShape(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Comment_Shape(Comment instance) {

+		try {

+			Object value_0 = body_Comment_Shape(instance);

+			if (value_0 != null) {

+				instance.setBody((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Constraint_Shape(Constraint instance) {

+		try {

+			Object value_0 = name_Constraint_Shape(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+			Object value_1 = specification_Constraint_Shape(instance);

+			if (value_1 != null) {

+				instance.setSpecification((ValueSpecification) value_1);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interface_Shape(Interface instance) {

+		try {

+			Object value_0 = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getInterface(), null)

+					.evaluate(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Port_Shape(Port instance) {

+		try {

+			Object value_0 = UMLOCLFactory.getExpression(1, UMLPackage.eINSTANCE.getPort(), null).evaluate(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+			instance.setAggregation(AggregationKind.COMPOSITE_LITERAL);

+

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Model_Shape_CN(Model instance) {

+		try {

+			Object value_0 = name_Model_Shape_CN(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Package_Shape_CN(Package instance) {

+		try {

+			Object value_0 = UMLOCLFactory.getExpression(5, UMLPackage.eINSTANCE.getPackage(), null).evaluate(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interface_ClassifierShape_CN(Interface instance) {

+		try {

+			Object value_0 = name_Interface_ClassifierShape_CN(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Component_PackagedElementShape_CCN(Component instance) {

+		try {

+			Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getComponent(), null)

+					.evaluate(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Component_PackagedElementShape_CN(Component instance) {

+		try {

+			Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getComponent(), null)

+					.evaluate(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Comment_Shape_CN(Comment instance) {

+		try {

+			Object value_0 = body_Comment_Shape_CN(instance);

+			if (value_0 != null) {

+				instance.setBody((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Constraint_Shape_CN(Constraint instance) {

+		try {

+			Object value_0 = name_Constraint_Shape_CN(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+			Object value_1 = specification_Constraint_Shape_CN(instance);

+			if (value_1 != null) {

+				instance.setSpecification((ValueSpecification) value_1);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Property_InterfaceAttributeLabel(Property instance) {

+		try {

+			Object value_0 = name_Property_InterfaceAttributeLabel(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Operation_InterfaceOperationLabel(Operation instance) {

+		try {

+			Object value_0 = name_Operation_InterfaceOperationLabel(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Reception_InterfaceReceptionLabel(Reception instance) {

+		try {

+			Object value_0 = name_Reception_InterfaceReceptionLabel(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interface_Shape_CN(Interface instance) {

+		try {

+			Object value_0 = UMLOCLFactory.getExpression(2, UMLPackage.eINSTANCE.getInterface(), null)

+					.evaluate(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Property_Shape(Property instance) {

+		try {

+			Object value_0 = name_Property_Shape(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Usage_Edge(Usage instance) {

+		try {

+			Object value_0 = UMLOCLFactory.getExpression(3, UMLPackage.eINSTANCE.getUsage(), null).evaluate(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InterfaceRealization_Edge(InterfaceRealization instance) {

+		try {

+			Object value_0 = UMLOCLFactory.getExpression(4, UMLPackage.eINSTANCE.getInterfaceRealization(), null)

+					.evaluate(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Substitution_Edge(Substitution instance) {

+		try {

+			Object value_0 = name_Substitution_Edge(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Manifestation_Edge(Manifestation instance) {

+		try {

+			Object value_0 = name_Manifestation_Edge(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ComponentRealization_Edge(ComponentRealization instance) {

+		try {

+			Object value_0 = name_ComponentRealization_Edge(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Abstraction_Edge(Abstraction instance) {

+		try {

+			Object value_0 = name_Abstraction_Edge(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Dependency_Edge(Dependency instance) {

+		try {

+			Object value_0 = name_Dependency_Edge(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Dependency_BranchEdge(Dependency instance) {

+		try {

+			Object value_0 = name_Dependency_BranchEdge(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Connector_Edge(Connector instance) {

+		try {

+			Object value_0 = name_Connector_Edge(instance);

+			if (value_0 != null) {

+				instance.setName((String) value_0);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Model_Shape(Model it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Interface_ClassifierShape(Interface it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String body_Comment_Shape(Comment it) {

+		// Comment body init

+		return "";

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Constraint_Shape(Constraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_Constraint_Shape(Constraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Model_Shape_CN(Model it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Interface_ClassifierShape_CN(Interface it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String body_Comment_Shape_CN(Comment it) {

+		// Comment body init

+		return "";

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Constraint_Shape_CN(Constraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_Constraint_Shape_CN(Constraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Property_InterfaceAttributeLabel(Property it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Operation_InterfaceOperationLabel(Operation it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Reception_InterfaceReceptionLabel(Reception it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Property_Shape(Property it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Substitution_Edge(Substitution it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Manifestation_Edge(Manifestation it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ComponentRealization_Edge(ComponentRealization it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Abstraction_Edge(Abstraction it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Dependency_Edge(Dependency it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Dependency_BranchEdge(Dependency it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Connector_Edge(Connector it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	public static ElementInitializers getInstance() {

+		ElementInitializers cached = UMLDiagramEditorPlugin.getInstance().getElementInitializers();

+		if (cached == null) {

+			UMLDiagramEditorPlugin.getInstance().setElementInitializers(cached = new ElementInitializers());

+		}

+		return cached;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLEditPartProvider.java
index 9fd88ffa7b3..3ac806ae7a1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLEditPartProvider.java
@@ -1,30 +1,30 @@
-/**
- * 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.component.providers;
-
-import org.eclipse.papyrus.infra.gmfdiag.common.providers.DefaultEditPartProvider;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UMLEditPartFactory;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-
-/**
- * @generated
- */
-public class UMLEditPartProvider extends DefaultEditPartProvider {
-
-	/**
-	 * @generated
-	 */
-	public UMLEditPartProvider() {
-		super(new UMLEditPartFactory(), UMLVisualIDRegistry.TYPED_INSTANCE, ComponentDiagramEditPart.MODEL_ID);
-	}
-}
+/**

+ * 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.component.providers;

+

+import org.eclipse.papyrus.infra.gmfdiag.common.providers.DefaultEditPartProvider;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.UMLEditPartFactory;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class UMLEditPartProvider extends DefaultEditPartProvider {

+

+	/**

+	 * @generated

+	 */

+	public UMLEditPartProvider() {

+		super(new UMLEditPartFactory(), UMLVisualIDRegistry.TYPED_INSTANCE, ComponentDiagramEditPart.MODEL_ID);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java
index 9b37924dd6b..dd6566229db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java
@@ -1,618 +1,618 @@
-/**
- * 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.component.providers;
-
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Set;
-
-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.uml.diagram.component.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DefaultNamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfacePortLinkEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.LinkDescriptorEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class UMLElementTypes {
-
-	/**
-	 * @generated
-	 */
-	private UMLElementTypes() {
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Map<IElementType, ENamedElement> elements;
-
-	/**
-	 * @generated
-	 */
-	private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages(
-			UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());
-
-	/**
-	 * @generated
-	 */
-	private static Set<IElementType> KNOWN_ELEMENT_TYPES;
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Package_ComponentDiagram = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Package_ComponentDiagram"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Dependency_Shape = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Dependency_Shape"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Component_PackagedElementShape = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Component_PackagedElementShape"); //$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$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Interface_ClassifierShape = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Interface_ClassifierShape"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Comment_Shape = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Comment_Shape"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Constraint_Shape = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Constraint_Shape"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType NamedElement_DefaultShape = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.NamedElement_DefaultShape"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Interface_Shape = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Interface_Shape"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Port_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Port_Shape"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	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$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Interface_ClassifierShape_CN = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Interface_ClassifierShape_CN"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Component_PackagedElementShape_CCN = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Component_PackagedElementShape_CCN"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Component_PackagedElementShape_CN = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Component_PackagedElementShape_CN"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	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$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Property_InterfaceAttributeLabel = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Operation_InterfaceOperationLabel = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Reception_InterfaceReceptionLabel = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Reception_InterfaceReceptionLabel"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Interface_Shape_CN = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Interface_Shape_CN"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Property_Shape = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Property_Shape"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Usage_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Usage_Edge"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType InterfaceRealization_Edge = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.InterfaceRealization_Edge"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Generalization_Edge = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Generalization_Edge"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Substitution_Edge = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Substitution_Edge"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Manifestation_Edge = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Manifestation_Edge"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType ComponentRealization_Edge = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.ComponentRealization_Edge"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Abstraction_Edge = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Abstraction_Edge"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	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$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Constraint_ConstrainedElementEdge = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	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$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Link_InterfacePortEdge = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Link_InterfacePortEdge"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Connector_Edge = getElementTypeByUniqueId(
-			"org.eclipse.papyrus.umldi.Connector_Edge"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static ImageDescriptor getImageDescriptor(ENamedElement element) {
-		return elementTypeImages.getImageDescriptor(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static Image getImage(ENamedElement element) {
-		return elementTypeImages.getImage(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static ImageDescriptor getImageDescriptor(IAdaptable hint) {
-		return getImageDescriptor(getElement(hint));
-	}
-
-	/**
-	 * @generated
-	 */
-	public static Image getImage(IAdaptable hint) {
-		return getImage(getElement(hint));
-	}
-
-	/**
-	 * 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<IElementType, ENamedElement>();
-
-			elements.put(Package_ComponentDiagram, UMLPackage.eINSTANCE.getPackage());
-
-			elements.put(Dependency_Shape, UMLPackage.eINSTANCE.getDependency());
-
-			elements.put(Component_PackagedElementShape, UMLPackage.eINSTANCE.getComponent());
-
-			elements.put(Model_Shape, UMLPackage.eINSTANCE.getModel());
-
-			elements.put(Package_Shape, UMLPackage.eINSTANCE.getPackage());
-
-			elements.put(Interface_ClassifierShape, UMLPackage.eINSTANCE.getInterface());
-
-			elements.put(Comment_Shape, UMLPackage.eINSTANCE.getComment());
-
-			elements.put(Constraint_Shape, UMLPackage.eINSTANCE.getConstraint());
-
-			elements.put(NamedElement_DefaultShape, UMLPackage.eINSTANCE.getNamedElement());
-
-			elements.put(Interface_Shape, UMLPackage.eINSTANCE.getInterface());
-
-			elements.put(Port_Shape, UMLPackage.eINSTANCE.getPort());
-
-			elements.put(Model_Shape_CN, UMLPackage.eINSTANCE.getModel());
-
-			elements.put(Package_Shape_CN, UMLPackage.eINSTANCE.getPackage());
-
-			elements.put(Interface_ClassifierShape_CN, UMLPackage.eINSTANCE.getInterface());
-
-			elements.put(Component_PackagedElementShape_CCN, UMLPackage.eINSTANCE.getComponent());
-
-			elements.put(Component_PackagedElementShape_CN, UMLPackage.eINSTANCE.getComponent());
-
-			elements.put(Comment_Shape_CN, UMLPackage.eINSTANCE.getComment());
-
-			elements.put(Constraint_Shape_CN, UMLPackage.eINSTANCE.getConstraint());
-
-			elements.put(Property_InterfaceAttributeLabel, UMLPackage.eINSTANCE.getProperty());
-
-			elements.put(Operation_InterfaceOperationLabel, UMLPackage.eINSTANCE.getOperation());
-
-			elements.put(Reception_InterfaceReceptionLabel, UMLPackage.eINSTANCE.getReception());
-
-			elements.put(Interface_Shape_CN, UMLPackage.eINSTANCE.getInterface());
-
-			elements.put(Property_Shape, UMLPackage.eINSTANCE.getProperty());
-
-			elements.put(Usage_Edge, UMLPackage.eINSTANCE.getUsage());
-
-			elements.put(InterfaceRealization_Edge, UMLPackage.eINSTANCE.getInterfaceRealization());
-
-			elements.put(Generalization_Edge, UMLPackage.eINSTANCE.getGeneralization());
-
-			elements.put(Substitution_Edge, UMLPackage.eINSTANCE.getSubstitution());
-
-			elements.put(Manifestation_Edge, UMLPackage.eINSTANCE.getManifestation());
-
-			elements.put(ComponentRealization_Edge, UMLPackage.eINSTANCE.getComponentRealization());
-
-			elements.put(Abstraction_Edge, UMLPackage.eINSTANCE.getAbstraction());
-
-			elements.put(Comment_AnnotatedElementEdge, UMLPackage.eINSTANCE.getComment_AnnotatedElement());
-
-			elements.put(Constraint_ConstrainedElementEdge, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());
-
-			elements.put(Dependency_Edge, UMLPackage.eINSTANCE.getDependency());
-
-			elements.put(Dependency_BranchEdge, UMLPackage.eINSTANCE.getDependency());
-
-			elements.put(Connector_Edge, UMLPackage.eINSTANCE.getConnector());
-		}
-		return elements.get(type);
-	}
-
-	/**
-	 * @generated
-	 */
-	private static IElementType getElementTypeByUniqueId(String id) {
-		return ElementTypeRegistry.getInstance().getType(id);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static IElementType getElementType(String visualID) {
-		if (visualID != null) {
-			switch (visualID) {
-			case ComponentDiagramEditPart.VISUAL_ID:
-				return Package_ComponentDiagram;
-			case DependencyNodeEditPart.VISUAL_ID:
-				return Dependency_Shape;
-			case ComponentEditPart.VISUAL_ID:
-				return Component_PackagedElementShape;
-			case ModelEditPart.VISUAL_ID:
-				return Model_Shape;
-			case PackageEditPart.VISUAL_ID:
-				return Package_Shape;
-			case RectangleInterfaceEditPart.VISUAL_ID:
-				return Interface_ClassifierShape;
-			case CommentEditPart.VISUAL_ID:
-				return Comment_Shape;
-			case ConstraintEditPart.VISUAL_ID:
-				return Constraint_Shape;
-			case DefaultNamedElementEditPart.VISUAL_ID:
-				return NamedElement_DefaultShape;
-			case InterfaceEditPart.VISUAL_ID:
-				return Interface_Shape;
-			case PortEditPart.VISUAL_ID:
-				return Port_Shape;
-			case ModelEditPartCN.VISUAL_ID:
-				return Model_Shape_CN;
-			case PackageEditPartCN.VISUAL_ID:
-				return Package_Shape_CN;
-			case RectangleInterfaceEditPartCN.VISUAL_ID:
-				return Interface_ClassifierShape_CN;
-			case ComponentEditPartCN.VISUAL_ID:
-				return Component_PackagedElementShape_CCN;
-			case ComponentEditPartPCN.VISUAL_ID:
-				return Component_PackagedElementShape_CN;
-			case CommentEditPartPCN.VISUAL_ID:
-				return Comment_Shape_CN;
-			case ConstraintEditPartPCN.VISUAL_ID:
-				return Constraint_Shape_CN;
-			case PropertyForInterfaceEditPart.VISUAL_ID:
-				return Property_InterfaceAttributeLabel;
-			case OperationForInterfaceEditPart.VISUAL_ID:
-				return Operation_InterfaceOperationLabel;
-			case ReceptionInInterfaceEditPart.VISUAL_ID:
-				return Reception_InterfaceReceptionLabel;
-			case InterfaceEditPartPCN.VISUAL_ID:
-				return Interface_Shape_CN;
-			case PropertyPartEditPartCN.VISUAL_ID:
-				return Property_Shape;
-			case UsageEditPart.VISUAL_ID:
-				return Usage_Edge;
-			case InterfaceRealizationEditPart.VISUAL_ID:
-				return InterfaceRealization_Edge;
-			case GeneralizationEditPart.VISUAL_ID:
-				return Generalization_Edge;
-			case SubstitutionEditPart.VISUAL_ID:
-				return Substitution_Edge;
-			case ManifestationEditPart.VISUAL_ID:
-				return Manifestation_Edge;
-			case ComponentRealizationEditPart.VISUAL_ID:
-				return ComponentRealization_Edge;
-			case AbstractionEditPart.VISUAL_ID:
-				return Abstraction_Edge;
-			case LinkDescriptorEditPart.VISUAL_ID:
-				return Link_DescriptorEdge;
-			case CommentAnnotatedElementEditPart.VISUAL_ID:
-				return Comment_AnnotatedElementEdge;
-			case ConstraintConstrainedElementEditPart.VISUAL_ID:
-				return Constraint_ConstrainedElementEdge;
-			case DependencyEditPart.VISUAL_ID:
-				return Dependency_Edge;
-			case DependencyBranchEditPart.VISUAL_ID:
-				return Dependency_BranchEdge;
-			case InterfacePortLinkEditPart.VISUAL_ID:
-				return Link_InterfacePortEdge;
-			case ConnectorEditPart.VISUAL_ID:
-				return Connector_Edge;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static synchronized boolean isKnownElementType(IElementType elementType) {
-		if (KNOWN_ELEMENT_TYPES == null) {
-			KNOWN_ELEMENT_TYPES = new HashSet<IElementType>();
-			KNOWN_ELEMENT_TYPES.add(Package_ComponentDiagram);
-			KNOWN_ELEMENT_TYPES.add(Dependency_Shape);
-			KNOWN_ELEMENT_TYPES.add(Component_PackagedElementShape);
-			KNOWN_ELEMENT_TYPES.add(Model_Shape);
-			KNOWN_ELEMENT_TYPES.add(Package_Shape);
-			KNOWN_ELEMENT_TYPES.add(Interface_ClassifierShape);
-			KNOWN_ELEMENT_TYPES.add(Comment_Shape);
-			KNOWN_ELEMENT_TYPES.add(Constraint_Shape);
-			KNOWN_ELEMENT_TYPES.add(NamedElement_DefaultShape);
-			KNOWN_ELEMENT_TYPES.add(Interface_Shape);
-			KNOWN_ELEMENT_TYPES.add(Port_Shape);
-			KNOWN_ELEMENT_TYPES.add(Model_Shape_CN);
-			KNOWN_ELEMENT_TYPES.add(Package_Shape_CN);
-			KNOWN_ELEMENT_TYPES.add(Interface_ClassifierShape_CN);
-			KNOWN_ELEMENT_TYPES.add(Component_PackagedElementShape_CCN);
-			KNOWN_ELEMENT_TYPES.add(Component_PackagedElementShape_CN);
-			KNOWN_ELEMENT_TYPES.add(Comment_Shape_CN);
-			KNOWN_ELEMENT_TYPES.add(Constraint_Shape_CN);
-			KNOWN_ELEMENT_TYPES.add(Property_InterfaceAttributeLabel);
-			KNOWN_ELEMENT_TYPES.add(Operation_InterfaceOperationLabel);
-			KNOWN_ELEMENT_TYPES.add(Reception_InterfaceReceptionLabel);
-			KNOWN_ELEMENT_TYPES.add(Interface_Shape_CN);
-			KNOWN_ELEMENT_TYPES.add(Property_Shape);
-			KNOWN_ELEMENT_TYPES.add(Usage_Edge);
-			KNOWN_ELEMENT_TYPES.add(InterfaceRealization_Edge);
-			KNOWN_ELEMENT_TYPES.add(Generalization_Edge);
-			KNOWN_ELEMENT_TYPES.add(Substitution_Edge);
-			KNOWN_ELEMENT_TYPES.add(Manifestation_Edge);
-			KNOWN_ELEMENT_TYPES.add(ComponentRealization_Edge);
-			KNOWN_ELEMENT_TYPES.add(Abstraction_Edge);
-			KNOWN_ELEMENT_TYPES.add(Link_DescriptorEdge);
-			KNOWN_ELEMENT_TYPES.add(Comment_AnnotatedElementEdge);
-			KNOWN_ELEMENT_TYPES.add(Constraint_ConstrainedElementEdge);
-			KNOWN_ELEMENT_TYPES.add(Dependency_Edge);
-			KNOWN_ELEMENT_TYPES.add(Dependency_BranchEdge);
-			KNOWN_ELEMENT_TYPES.add(Link_InterfacePortEdge);
-			KNOWN_ELEMENT_TYPES.add(Connector_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) {
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public boolean isKnownElementType(IElementType elementType) {
-			return org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes.isKnownElementType(elementType);
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public IElementType getElementTypeForVisualId(String visualID) {
-			return org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes.getElementType(visualID);
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public ENamedElement getDefiningNamedElement(IAdaptable elementTypeAdapter) {
-			return org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes.getElement(elementTypeAdapter);
-		}
-	};
-
-	/**
-	 * @generated
-	 */
-	public static boolean isKindOf(IElementType subtype, IElementType supertype) {
-		boolean result = subtype == supertype;
-
-		if (!result) {
-			IElementType[] supertypes = subtype.getAllSuperTypes();
-			for (int i = 0; !result && (i < supertypes.length); i++) {
-				result = supertype == supertypes[i];
-			}
-		}
-
-		return result;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.component.providers;

+

+import java.util.HashSet;

+import java.util.IdentityHashMap;

+import java.util.Map;

+import java.util.Set;

+

+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.uml.diagram.component.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DefaultNamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfacePortLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.LinkDescriptorEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class UMLElementTypes {

+

+	/**

+	 * @generated

+	 */

+	private UMLElementTypes() {

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Map<IElementType, ENamedElement> elements;

+

+	/**

+	 * @generated

+	 */

+	private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages(

+			UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());

+

+	/**

+	 * @generated

+	 */

+	private static Set<IElementType> KNOWN_ELEMENT_TYPES;

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Package_ComponentDiagram = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Package_ComponentDiagram"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Dependency_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Dependency_Shape"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Component_PackagedElementShape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Component_PackagedElementShape"); //$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$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Interface_ClassifierShape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Interface_ClassifierShape"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Comment_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Comment_Shape"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Constraint_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Constraint_Shape"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType NamedElement_DefaultShape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.NamedElement_DefaultShape"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Interface_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Interface_Shape"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Port_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Port_Shape"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	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$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Interface_ClassifierShape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Interface_ClassifierShape_CN"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Component_PackagedElementShape_CCN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Component_PackagedElementShape_CCN"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Component_PackagedElementShape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Component_PackagedElementShape_CN"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	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$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Property_InterfaceAttributeLabel = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Operation_InterfaceOperationLabel = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Reception_InterfaceReceptionLabel = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Reception_InterfaceReceptionLabel"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Interface_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Interface_Shape_CN"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Property_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Property_Shape"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Usage_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Usage_Edge"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType InterfaceRealization_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.InterfaceRealization_Edge"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Generalization_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Generalization_Edge"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Substitution_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Substitution_Edge"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Manifestation_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Manifestation_Edge"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType ComponentRealization_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.ComponentRealization_Edge"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Abstraction_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Abstraction_Edge"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	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$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Constraint_ConstrainedElementEdge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	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$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Link_InterfacePortEdge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Link_InterfacePortEdge"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Connector_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Connector_Edge"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static ImageDescriptor getImageDescriptor(ENamedElement element) {

+		return elementTypeImages.getImageDescriptor(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static Image getImage(ENamedElement element) {

+		return elementTypeImages.getImage(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static ImageDescriptor getImageDescriptor(IAdaptable hint) {

+		return getImageDescriptor(getElement(hint));

+	}

+

+	/**

+	 * @generated

+	 */

+	public static Image getImage(IAdaptable hint) {

+		return getImage(getElement(hint));

+	}

+

+	/**

+	 * 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<IElementType, ENamedElement>();

+

+			elements.put(Package_ComponentDiagram, UMLPackage.eINSTANCE.getPackage());

+

+			elements.put(Dependency_Shape, UMLPackage.eINSTANCE.getDependency());

+

+			elements.put(Component_PackagedElementShape, UMLPackage.eINSTANCE.getComponent());

+

+			elements.put(Model_Shape, UMLPackage.eINSTANCE.getModel());

+

+			elements.put(Package_Shape, UMLPackage.eINSTANCE.getPackage());

+

+			elements.put(Interface_ClassifierShape, UMLPackage.eINSTANCE.getInterface());

+

+			elements.put(Comment_Shape, UMLPackage.eINSTANCE.getComment());

+

+			elements.put(Constraint_Shape, UMLPackage.eINSTANCE.getConstraint());

+

+			elements.put(NamedElement_DefaultShape, UMLPackage.eINSTANCE.getNamedElement());

+

+			elements.put(Interface_Shape, UMLPackage.eINSTANCE.getInterface());

+

+			elements.put(Port_Shape, UMLPackage.eINSTANCE.getPort());

+

+			elements.put(Model_Shape_CN, UMLPackage.eINSTANCE.getModel());

+

+			elements.put(Package_Shape_CN, UMLPackage.eINSTANCE.getPackage());

+

+			elements.put(Interface_ClassifierShape_CN, UMLPackage.eINSTANCE.getInterface());

+

+			elements.put(Component_PackagedElementShape_CCN, UMLPackage.eINSTANCE.getComponent());

+

+			elements.put(Component_PackagedElementShape_CN, UMLPackage.eINSTANCE.getComponent());

+

+			elements.put(Comment_Shape_CN, UMLPackage.eINSTANCE.getComment());

+

+			elements.put(Constraint_Shape_CN, UMLPackage.eINSTANCE.getConstraint());

+

+			elements.put(Property_InterfaceAttributeLabel, UMLPackage.eINSTANCE.getProperty());

+

+			elements.put(Operation_InterfaceOperationLabel, UMLPackage.eINSTANCE.getOperation());

+

+			elements.put(Reception_InterfaceReceptionLabel, UMLPackage.eINSTANCE.getReception());

+

+			elements.put(Interface_Shape_CN, UMLPackage.eINSTANCE.getInterface());

+

+			elements.put(Property_Shape, UMLPackage.eINSTANCE.getProperty());

+

+			elements.put(Usage_Edge, UMLPackage.eINSTANCE.getUsage());

+

+			elements.put(InterfaceRealization_Edge, UMLPackage.eINSTANCE.getInterfaceRealization());

+

+			elements.put(Generalization_Edge, UMLPackage.eINSTANCE.getGeneralization());

+

+			elements.put(Substitution_Edge, UMLPackage.eINSTANCE.getSubstitution());

+

+			elements.put(Manifestation_Edge, UMLPackage.eINSTANCE.getManifestation());

+

+			elements.put(ComponentRealization_Edge, UMLPackage.eINSTANCE.getComponentRealization());

+

+			elements.put(Abstraction_Edge, UMLPackage.eINSTANCE.getAbstraction());

+

+			elements.put(Comment_AnnotatedElementEdge, UMLPackage.eINSTANCE.getComment_AnnotatedElement());

+

+			elements.put(Constraint_ConstrainedElementEdge, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());

+

+			elements.put(Dependency_Edge, UMLPackage.eINSTANCE.getDependency());

+

+			elements.put(Dependency_BranchEdge, UMLPackage.eINSTANCE.getDependency());

+

+			elements.put(Connector_Edge, UMLPackage.eINSTANCE.getConnector());

+		}

+		return elements.get(type);

+	}

+

+	/**

+	 * @generated

+	 */

+	private static IElementType getElementTypeByUniqueId(String id) {

+		return ElementTypeRegistry.getInstance().getType(id);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static IElementType getElementType(String visualID) {

+		if (visualID != null) {

+			switch (visualID) {

+			case ComponentDiagramEditPart.VISUAL_ID:

+				return Package_ComponentDiagram;

+			case DependencyNodeEditPart.VISUAL_ID:

+				return Dependency_Shape;

+			case ComponentEditPart.VISUAL_ID:

+				return Component_PackagedElementShape;

+			case ModelEditPart.VISUAL_ID:

+				return Model_Shape;

+			case PackageEditPart.VISUAL_ID:

+				return Package_Shape;

+			case RectangleInterfaceEditPart.VISUAL_ID:

+				return Interface_ClassifierShape;

+			case CommentEditPart.VISUAL_ID:

+				return Comment_Shape;

+			case ConstraintEditPart.VISUAL_ID:

+				return Constraint_Shape;

+			case DefaultNamedElementEditPart.VISUAL_ID:

+				return NamedElement_DefaultShape;

+			case InterfaceEditPart.VISUAL_ID:

+				return Interface_Shape;

+			case PortEditPart.VISUAL_ID:

+				return Port_Shape;

+			case ModelEditPartCN.VISUAL_ID:

+				return Model_Shape_CN;

+			case PackageEditPartCN.VISUAL_ID:

+				return Package_Shape_CN;

+			case RectangleInterfaceEditPartCN.VISUAL_ID:

+				return Interface_ClassifierShape_CN;

+			case ComponentEditPartCN.VISUAL_ID:

+				return Component_PackagedElementShape_CCN;

+			case ComponentEditPartPCN.VISUAL_ID:

+				return Component_PackagedElementShape_CN;

+			case CommentEditPartPCN.VISUAL_ID:

+				return Comment_Shape_CN;

+			case ConstraintEditPartPCN.VISUAL_ID:

+				return Constraint_Shape_CN;

+			case PropertyForInterfaceEditPart.VISUAL_ID:

+				return Property_InterfaceAttributeLabel;

+			case OperationForInterfaceEditPart.VISUAL_ID:

+				return Operation_InterfaceOperationLabel;

+			case ReceptionInInterfaceEditPart.VISUAL_ID:

+				return Reception_InterfaceReceptionLabel;

+			case InterfaceEditPartPCN.VISUAL_ID:

+				return Interface_Shape_CN;

+			case PropertyPartEditPartCN.VISUAL_ID:

+				return Property_Shape;

+			case UsageEditPart.VISUAL_ID:

+				return Usage_Edge;

+			case InterfaceRealizationEditPart.VISUAL_ID:

+				return InterfaceRealization_Edge;

+			case GeneralizationEditPart.VISUAL_ID:

+				return Generalization_Edge;

+			case SubstitutionEditPart.VISUAL_ID:

+				return Substitution_Edge;

+			case ManifestationEditPart.VISUAL_ID:

+				return Manifestation_Edge;

+			case ComponentRealizationEditPart.VISUAL_ID:

+				return ComponentRealization_Edge;

+			case AbstractionEditPart.VISUAL_ID:

+				return Abstraction_Edge;

+			case LinkDescriptorEditPart.VISUAL_ID:

+				return Link_DescriptorEdge;

+			case CommentAnnotatedElementEditPart.VISUAL_ID:

+				return Comment_AnnotatedElementEdge;

+			case ConstraintConstrainedElementEditPart.VISUAL_ID:

+				return Constraint_ConstrainedElementEdge;

+			case DependencyEditPart.VISUAL_ID:

+				return Dependency_Edge;

+			case DependencyBranchEditPart.VISUAL_ID:

+				return Dependency_BranchEdge;

+			case InterfacePortLinkEditPart.VISUAL_ID:

+				return Link_InterfacePortEdge;

+			case ConnectorEditPart.VISUAL_ID:

+				return Connector_Edge;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static synchronized boolean isKnownElementType(IElementType elementType) {

+		if (KNOWN_ELEMENT_TYPES == null) {

+			KNOWN_ELEMENT_TYPES = new HashSet<IElementType>();

+			KNOWN_ELEMENT_TYPES.add(Package_ComponentDiagram);

+			KNOWN_ELEMENT_TYPES.add(Dependency_Shape);

+			KNOWN_ELEMENT_TYPES.add(Component_PackagedElementShape);

+			KNOWN_ELEMENT_TYPES.add(Model_Shape);

+			KNOWN_ELEMENT_TYPES.add(Package_Shape);

+			KNOWN_ELEMENT_TYPES.add(Interface_ClassifierShape);

+			KNOWN_ELEMENT_TYPES.add(Comment_Shape);

+			KNOWN_ELEMENT_TYPES.add(Constraint_Shape);

+			KNOWN_ELEMENT_TYPES.add(NamedElement_DefaultShape);

+			KNOWN_ELEMENT_TYPES.add(Interface_Shape);

+			KNOWN_ELEMENT_TYPES.add(Port_Shape);

+			KNOWN_ELEMENT_TYPES.add(Model_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(Package_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(Interface_ClassifierShape_CN);

+			KNOWN_ELEMENT_TYPES.add(Component_PackagedElementShape_CCN);

+			KNOWN_ELEMENT_TYPES.add(Component_PackagedElementShape_CN);

+			KNOWN_ELEMENT_TYPES.add(Comment_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(Constraint_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(Property_InterfaceAttributeLabel);

+			KNOWN_ELEMENT_TYPES.add(Operation_InterfaceOperationLabel);

+			KNOWN_ELEMENT_TYPES.add(Reception_InterfaceReceptionLabel);

+			KNOWN_ELEMENT_TYPES.add(Interface_Shape_CN);

+			KNOWN_ELEMENT_TYPES.add(Property_Shape);

+			KNOWN_ELEMENT_TYPES.add(Usage_Edge);

+			KNOWN_ELEMENT_TYPES.add(InterfaceRealization_Edge);

+			KNOWN_ELEMENT_TYPES.add(Generalization_Edge);

+			KNOWN_ELEMENT_TYPES.add(Substitution_Edge);

+			KNOWN_ELEMENT_TYPES.add(Manifestation_Edge);

+			KNOWN_ELEMENT_TYPES.add(ComponentRealization_Edge);

+			KNOWN_ELEMENT_TYPES.add(Abstraction_Edge);

+			KNOWN_ELEMENT_TYPES.add(Link_DescriptorEdge);

+			KNOWN_ELEMENT_TYPES.add(Comment_AnnotatedElementEdge);

+			KNOWN_ELEMENT_TYPES.add(Constraint_ConstrainedElementEdge);

+			KNOWN_ELEMENT_TYPES.add(Dependency_Edge);

+			KNOWN_ELEMENT_TYPES.add(Dependency_BranchEdge);

+			KNOWN_ELEMENT_TYPES.add(Link_InterfacePortEdge);

+			KNOWN_ELEMENT_TYPES.add(Connector_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) {

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public boolean isKnownElementType(IElementType elementType) {

+			return org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes.isKnownElementType(elementType);

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public IElementType getElementTypeForVisualId(String visualID) {

+			return org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes.getElementType(visualID);

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public ENamedElement getDefiningNamedElement(IAdaptable elementTypeAdapter) {

+			return org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes.getElement(elementTypeAdapter);

+		}

+	};

+

+	/**

+	 * @generated

+	 */

+	public static boolean isKindOf(IElementType subtype, IElementType supertype) {

+		boolean result = subtype == supertype;

+

+		if (!result) {

+			IElementType[] supertypes = subtype.getAllSuperTypes();

+			for (int i = 0; !result && (i < supertypes.length); i++) {

+				result = supertype == supertypes[i];

+			}

+		}

+

+		return result;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLIconProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLIconProvider.java
index a5ff2654cc3..96b8e16f345 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLIconProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLIconProvider.java
@@ -1,28 +1,28 @@
-/**
- * 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.component.providers;
-
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider;
-import org.eclipse.papyrus.infra.gmfdiag.common.providers.DefaultElementTypeIconProvider;
-
-/**
- * @generated
- */
-public class UMLIconProvider extends DefaultElementTypeIconProvider implements IIconProvider {
-
-	/**
-	 * @generated
-	 */
-	public UMLIconProvider() {
-		super(UMLElementTypes.TYPED_INSTANCE);
-	}
-}
+/**

+ * 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.component.providers;

+

+import org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider;

+import org.eclipse.papyrus.infra.gmfdiag.common.providers.DefaultElementTypeIconProvider;

+

+/**

+ * @generated

+ */

+public class UMLIconProvider extends DefaultElementTypeIconProvider implements IIconProvider {

+

+	/**

+	 * @generated

+	 */

+	public UMLIconProvider() {

+		super(UMLElementTypes.TYPED_INSTANCE);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLMarkerNavigationProvider.java
index baa9729ef82..926dfdf1810 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLMarkerNavigationProvider.java
@@ -1,93 +1,93 @@
-/**
- * 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.component.providers;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorUtil;
-
-/**
- * @generated
- */
-public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String MARKER_TYPE = UMLDiagramEditorPlugin.ID + ".diagnostic"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void doGotoMarker(IMarker marker) {
-		String elementId = marker.getAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, null);
-		if (elementId == null || !(getEditor() instanceof DiagramEditor)) {
-			return;
-		}
-		DiagramEditor editor = (DiagramEditor) getEditor();
-		Map<?, ?> editPartRegistry = editor.getDiagramGraphicalViewer().getEditPartRegistry();
-		EObject targetView = editor.getDiagram().eResource().getEObject(elementId);
-		if (targetView == null) {
-			return;
-		}
-		EditPart targetEditPart = (EditPart) editPartRegistry.get(targetView);
-		if (targetEditPart != null) {
-			UMLDiagramEditorUtil.selectElementsInDiagram(editor, Arrays.asList(new EditPart[] { targetEditPart }));
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void deleteMarkers(IResource resource) {
-		try {
-			resource.deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_ZERO);
-		} catch (CoreException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Failed to delete validation markers", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public static IMarker addMarker(IFile file, String elementId, String location, String message, int statusSeverity) {
-		IMarker marker = null;
-		try {
-			marker = file.createMarker(MARKER_TYPE);
-			marker.setAttribute(IMarker.MESSAGE, message);
-			marker.setAttribute(IMarker.LOCATION, location);
-			marker.setAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, elementId);
-			int markerSeverity = IMarker.SEVERITY_INFO;
-			if (statusSeverity == IStatus.WARNING) {
-				markerSeverity = IMarker.SEVERITY_WARNING;
-			} 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$
-		}
-		return marker;
-	}
-}
+/**

+ * 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.component.providers;

+

+import java.util.Arrays;

+import java.util.Map;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IMarker;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

+import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorUtil;

+

+/**

+ * @generated

+ */

+public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String MARKER_TYPE = UMLDiagramEditorPlugin.ID + ".diagnostic"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void doGotoMarker(IMarker marker) {

+		String elementId = marker.getAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, null);

+		if (elementId == null || !(getEditor() instanceof DiagramEditor)) {

+			return;

+		}

+		DiagramEditor editor = (DiagramEditor) getEditor();

+		Map<?, ?> editPartRegistry = editor.getDiagramGraphicalViewer().getEditPartRegistry();

+		EObject targetView = editor.getDiagram().eResource().getEObject(elementId);

+		if (targetView == null) {

+			return;

+		}

+		EditPart targetEditPart = (EditPart) editPartRegistry.get(targetView);

+		if (targetEditPart != null) {

+			UMLDiagramEditorUtil.selectElementsInDiagram(editor, Arrays.asList(new EditPart[] { targetEditPart }));

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void deleteMarkers(IResource resource) {

+		try {

+			resource.deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_ZERO);

+		} catch (CoreException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Failed to delete validation markers", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static IMarker addMarker(IFile file, String elementId, String location, String message, int statusSeverity) {

+		IMarker marker = null;

+		try {

+			marker = file.createMarker(MARKER_TYPE);

+			marker.setAttribute(IMarker.MESSAGE, message);

+			marker.setAttribute(IMarker.LOCATION, location);

+			marker.setAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, elementId);

+			int markerSeverity = IMarker.SEVERITY_INFO;

+			if (statusSeverity == IStatus.WARNING) {

+				markerSeverity = IMarker.SEVERITY_WARNING;

+			} 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$

+		}

+		return marker;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLParserProvider.java
index caa45cfb1c3..25044825bac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLParserProvider.java
@@ -1,1131 +1,1131 @@
-/**
- * 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.component.providers;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.parser.CommentParser;
-import org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser;
-import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentBodyEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentBodyEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentNameEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintNameEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintSpecificationEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintSpecificationEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DefaultNamedElementNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeFloatingLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceFloatingLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceFloatingLabelEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceNameEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.MultiDependencyLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceFloatingLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceFloatingLabelEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.parsers.MessageFormatParser;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class UMLParserProvider extends AbstractProvider implements IParserProvider {
-
-	/**
-	 * @generated
-	 */
-	private IParser dependency_MultiNameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDependency_MultiNameLabel_Parser() {
-		if (dependency_MultiNameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			dependency_MultiNameLabel_Parser = parser;
-		}
-		return dependency_MultiNameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser dependency_FloatingNameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDependency_FloatingNameLabel_Parser() {
-		if (dependency_FloatingNameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			dependency_FloatingNameLabel_Parser = parser;
-		}
-		return dependency_FloatingNameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser component_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComponent_NameLabel_Parser() {
-		if (component_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			component_NameLabel_Parser = parser;
-		}
-		return component_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser component_FloatingNameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComponent_FloatingNameLabel_Parser() {
-		if (component_FloatingNameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			component_FloatingNameLabel_Parser = parser;
-		}
-		return component_FloatingNameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser model_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getModel_NameLabel_Parser() {
-		if (model_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			model_NameLabel_Parser = parser;
-		}
-		return model_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser package_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getPackage_NameLabel_Parser() {
-		if (package_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			package_NameLabel_Parser = parser;
-		}
-		return package_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interface_ClassifierNameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterface_ClassifierNameLabel_Parser() {
-		if (interface_ClassifierNameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interface_ClassifierNameLabel_Parser = parser;
-		}
-		return interface_ClassifierNameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interface_ClassifierFloatingNameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterface_ClassifierFloatingNameLabel_Parser() {
-		if (interface_ClassifierFloatingNameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interface_ClassifierFloatingNameLabel_Parser = parser;
-		}
-		return interface_ClassifierFloatingNameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private CommentParser comment_BodyLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComment_BodyLabel_Parser() {
-		if (comment_BodyLabel_Parser == null) {
-			comment_BodyLabel_Parser = new CommentParser();
-		}
-		return comment_BodyLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser constraint_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConstraint_NameLabel_Parser() {
-		if (constraint_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			constraint_NameLabel_Parser = parser;
-		}
-		return constraint_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ConstraintParser constraint_BodyLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConstraint_BodyLabel_Parser() {
-		if (constraint_BodyLabel_Parser == null) {
-			constraint_BodyLabel_Parser = new ConstraintParser();
-		}
-		return constraint_BodyLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser namedElement_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getNamedElement_NameLabel_Parser() {
-		if (namedElement_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			namedElement_NameLabel_Parser = parser;
-		}
-		return namedElement_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interface_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterface_NameLabel_Parser() {
-		if (interface_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interface_NameLabel_Parser = parser;
-		}
-		return interface_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interface_FloatingNameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterface_FloatingNameLabel_Parser() {
-		if (interface_FloatingNameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interface_FloatingNameLabel_Parser = parser;
-		}
-		return interface_FloatingNameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser port_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getPort_NameLabel_Parser() {
-		if (port_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			port_NameLabel_Parser = parser;
-		}
-		return port_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser port_StereotypeLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getPort_StereotypeLabel_Parser() {
-		if (port_StereotypeLabel_Parser == null) {
-			port_StereotypeLabel_Parser = new AppliedStereotypeParser();
-		}
-		return port_StereotypeLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser model_NameLabel_CN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getModel_NameLabel_CN_Parser() {
-		if (model_NameLabel_CN_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			model_NameLabel_CN_Parser = parser;
-		}
-		return model_NameLabel_CN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser package_NameLabel_CN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getPackage_NameLabel_CN_Parser() {
-		if (package_NameLabel_CN_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			package_NameLabel_CN_Parser = parser;
-		}
-		return package_NameLabel_CN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interface_ClassifierNameLabel_CN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterface_ClassifierNameLabel_CN_Parser() {
-		if (interface_ClassifierNameLabel_CN_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interface_ClassifierNameLabel_CN_Parser = parser;
-		}
-		return interface_ClassifierNameLabel_CN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interface_ClassifierFloatingNameLabel_CN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterface_ClassifierFloatingNameLabel_CN_Parser() {
-		if (interface_ClassifierFloatingNameLabel_CN_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interface_ClassifierFloatingNameLabel_CN_Parser = parser;
-		}
-		return interface_ClassifierFloatingNameLabel_CN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser component_NameLabel_CCN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComponent_NameLabel_CCN_Parser() {
-		if (component_NameLabel_CCN_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}"); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			component_NameLabel_CCN_Parser = parser;
-		}
-		return component_NameLabel_CCN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser component_FloatingNameLabel_CCN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComponent_FloatingNameLabel_CCN_Parser() {
-		if (component_FloatingNameLabel_CCN_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			component_FloatingNameLabel_CCN_Parser = parser;
-		}
-		return component_FloatingNameLabel_CCN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser component_NameLabel_CN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComponent_NameLabel_CN_Parser() {
-		if (component_NameLabel_CN_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}"); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			component_NameLabel_CN_Parser = parser;
-		}
-		return component_NameLabel_CN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser component_FloatingNameLabel_CN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComponent_FloatingNameLabel_CN_Parser() {
-		if (component_FloatingNameLabel_CN_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			component_FloatingNameLabel_CN_Parser = parser;
-		}
-		return component_FloatingNameLabel_CN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private CommentParser comment_BodyLabel_CN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComment_BodyLabel_CN_Parser() {
-		if (comment_BodyLabel_CN_Parser == null) {
-			comment_BodyLabel_CN_Parser = new CommentParser();
-		}
-		return comment_BodyLabel_CN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser constraint_NameLabel_CN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConstraint_NameLabel_CN_Parser() {
-		if (constraint_NameLabel_CN_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			constraint_NameLabel_CN_Parser = parser;
-		}
-		return constraint_NameLabel_CN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ConstraintParser constraint_BodyLabel_CN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConstraint_BodyLabel_CN_Parser() {
-		if (constraint_BodyLabel_CN_Parser == null) {
-			constraint_BodyLabel_CN_Parser = new ConstraintParser();
-		}
-		return constraint_BodyLabel_CN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser property_InterfaceAttributeLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getProperty_InterfaceAttributeLabel_Parser() {
-		if (property_InterfaceAttributeLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			property_InterfaceAttributeLabel_Parser = parser;
-		}
-		return property_InterfaceAttributeLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser operation_InterfaceOperationLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getOperation_InterfaceOperationLabel_Parser() {
-		if (operation_InterfaceOperationLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			operation_InterfaceOperationLabel_Parser = parser;
-		}
-		return operation_InterfaceOperationLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser reception_InterfaceReceptionLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getReception_InterfaceReceptionLabel_Parser() {
-		if (reception_InterfaceReceptionLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("\u00ABSignal\u00BB {0}"); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			reception_InterfaceReceptionLabel_Parser = parser;
-		}
-		return reception_InterfaceReceptionLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interface_NameLabel_CN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterface_NameLabel_CN_Parser() {
-		if (interface_NameLabel_CN_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interface_NameLabel_CN_Parser = parser;
-		}
-		return interface_NameLabel_CN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interface_FloatingNameLabel_CN_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterface_FloatingNameLabel_CN_Parser() {
-		if (interface_FloatingNameLabel_CN_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interface_FloatingNameLabel_CN_Parser = parser;
-		}
-		return interface_FloatingNameLabel_CN_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser property_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getProperty_NameLabel_Parser() {
-		if (property_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}"); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			property_NameLabel_Parser = parser;
-		}
-		return property_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser usage_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getUsage_NameLabel_Parser() {
-		if (usage_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			usage_NameLabel_Parser = parser;
-		}
-		return usage_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser usage_StereotypeLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getUsage_StereotypeLabel_Parser() {
-		if (usage_StereotypeLabel_Parser == null) {
-			usage_StereotypeLabel_Parser = new AppliedStereotypeParser();
-		}
-		return usage_StereotypeLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interfaceRealization_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterfaceRealization_NameLabel_Parser() {
-		if (interfaceRealization_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interfaceRealization_NameLabel_Parser = parser;
-		}
-		return interfaceRealization_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser interfaceRealization_StereotypeLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterfaceRealization_StereotypeLabel_Parser() {
-		if (interfaceRealization_StereotypeLabel_Parser == null) {
-			interfaceRealization_StereotypeLabel_Parser = new AppliedStereotypeParser();
-		}
-		return interfaceRealization_StereotypeLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser generalization_StereotypeLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getGeneralization_StereotypeLabel_Parser() {
-		if (generalization_StereotypeLabel_Parser == null) {
-			generalization_StereotypeLabel_Parser = new AppliedStereotypeParser();
-		}
-		return generalization_StereotypeLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser substitution_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getSubstitution_NameLabel_Parser() {
-		if (substitution_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			substitution_NameLabel_Parser = parser;
-		}
-		return substitution_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser substitution_StereotypeLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getSubstitution_StereotypeLabel_Parser() {
-		if (substitution_StereotypeLabel_Parser == null) {
-			substitution_StereotypeLabel_Parser = new AppliedStereotypeParser();
-		}
-		return substitution_StereotypeLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser manifestation_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getManifestation_NameLabel_Parser() {
-		if (manifestation_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			manifestation_NameLabel_Parser = parser;
-		}
-		return manifestation_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser manifestation_StereotypeLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getManifestation_StereotypeLabel_Parser() {
-		if (manifestation_StereotypeLabel_Parser == null) {
-			manifestation_StereotypeLabel_Parser = new AppliedStereotypeParser();
-		}
-		return manifestation_StereotypeLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser componentRealization_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComponentRealization_NameLabel_Parser() {
-		if (componentRealization_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			componentRealization_NameLabel_Parser = parser;
-		}
-		return componentRealization_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser componentRealization_StereotypeLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComponentRealization_StereotypeLabel_Parser() {
-		if (componentRealization_StereotypeLabel_Parser == null) {
-			componentRealization_StereotypeLabel_Parser = new AppliedStereotypeParser();
-		}
-		return componentRealization_StereotypeLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser abstraction_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getAbstraction_NameLabel_Parser() {
-		if (abstraction_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			abstraction_NameLabel_Parser = parser;
-		}
-		return abstraction_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser abstraction_StereotypeLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getAbstraction_StereotypeLabel_Parser() {
-		if (abstraction_StereotypeLabel_Parser == null) {
-			abstraction_StereotypeLabel_Parser = new AppliedStereotypeParser();
-		}
-		return abstraction_StereotypeLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser dependency_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDependency_NameLabel_Parser() {
-		if (dependency_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			dependency_NameLabel_Parser = parser;
-		}
-		return dependency_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser dependency_StereotypeLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDependency_StereotypeLabel_Parser() {
-		if (dependency_StereotypeLabel_Parser == null) {
-			dependency_StereotypeLabel_Parser = new AppliedStereotypeParser();
-		}
-		return dependency_StereotypeLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser connector_StereotypeLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConnector_StereotypeLabel_Parser() {
-		if (connector_StereotypeLabel_Parser == null) {
-			connector_StereotypeLabel_Parser = new AppliedStereotypeParser();
-		}
-		return connector_StereotypeLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser connector_NameLabel_Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConnector_NameLabel_Parser() {
-		if (connector_NameLabel_Parser == null) {
-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
-			MessageFormatParser parser = new MessageFormatParser(features);
-			connector_NameLabel_Parser = parser;
-		}
-		return connector_NameLabel_Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser getParser(String visualID) {
-		if (visualID != null) {
-			switch (visualID) {
-			case MultiDependencyLabelEditPart.VISUAL_ID:
-				return getDependency_MultiNameLabel_Parser();
-			case DependencyNodeFloatingLabelEditPart.VISUAL_ID:
-				return getDependency_FloatingNameLabel_Parser();
-
-			case ComponentNameEditPart.VISUAL_ID:
-				return getComponent_NameLabel_Parser();
-			case ComponentFloatingLabelEditPart.VISUAL_ID:
-				return getComponent_FloatingNameLabel_Parser();
-
-			case ModelNameEditPart.VISUAL_ID:
-				return getModel_NameLabel_Parser();
-
-			case PackageNameEditPart.VISUAL_ID:
-				return getPackage_NameLabel_Parser();
-
-			case RectangleInterfaceNameEditPart.VISUAL_ID:
-				return getInterface_ClassifierNameLabel_Parser();
-			case RectangleInterfaceFloatingLabelEditPart.VISUAL_ID:
-				return getInterface_ClassifierFloatingNameLabel_Parser();
-
-			case CommentBodyEditPart.VISUAL_ID:
-				return getComment_BodyLabel_Parser();
-
-			case ConstraintNameEditPart.VISUAL_ID:
-				return getConstraint_NameLabel_Parser();
-			case ConstraintSpecificationEditPart.VISUAL_ID:
-				return getConstraint_BodyLabel_Parser();
-
-			case DefaultNamedElementNameEditPart.VISUAL_ID:
-				return getNamedElement_NameLabel_Parser();
-
-			case InterfaceNameEditPart.VISUAL_ID:
-				return getInterface_NameLabel_Parser();
-			case InterfaceFloatingLabelEditPart.VISUAL_ID:
-				return getInterface_FloatingNameLabel_Parser();
-
-			case PortNameEditPart.VISUAL_ID:
-				return getPort_NameLabel_Parser();
-			case PortAppliedStereotypeEditPart.VISUAL_ID:
-				return getPort_StereotypeLabel_Parser();
-
-			case ModelNameEditPartCN.VISUAL_ID:
-				return getModel_NameLabel_CN_Parser();
-
-			case PackageNameEditPartCN.VISUAL_ID:
-				return getPackage_NameLabel_CN_Parser();
-
-			case RectangleInterfaceNameEditPartCN.VISUAL_ID:
-				return getInterface_ClassifierNameLabel_CN_Parser();
-			case RectangleInterfaceFloatingLabelEditPartCN.VISUAL_ID:
-				return getInterface_ClassifierFloatingNameLabel_CN_Parser();
-
-			case ComponentNameEditPartCN.VISUAL_ID:
-				return getComponent_NameLabel_CCN_Parser();
-			case ComponentFloatingLabelEditPartCN.VISUAL_ID:
-				return getComponent_FloatingNameLabel_CCN_Parser();
-
-			case ComponentNameEditPartPCN.VISUAL_ID:
-				return getComponent_NameLabel_CN_Parser();
-			case ComponentFloatingLabelEditPartPCN.VISUAL_ID:
-				return getComponent_FloatingNameLabel_CN_Parser();
-
-			case CommentBodyEditPartPCN.VISUAL_ID:
-				return getComment_BodyLabel_CN_Parser();
-
-			case ConstraintNameEditPartPCN.VISUAL_ID:
-				return getConstraint_NameLabel_CN_Parser();
-			case ConstraintSpecificationEditPartPCN.VISUAL_ID:
-				return getConstraint_BodyLabel_CN_Parser();
-
-			case PropertyForInterfaceEditPart.VISUAL_ID:
-				return getProperty_InterfaceAttributeLabel_Parser();
-			case OperationForInterfaceEditPart.VISUAL_ID:
-				return getOperation_InterfaceOperationLabel_Parser();
-			case ReceptionInInterfaceEditPart.VISUAL_ID:
-				return getReception_InterfaceReceptionLabel_Parser();
-			case InterfaceNameEditPartPCN.VISUAL_ID:
-				return getInterface_NameLabel_CN_Parser();
-			case InterfaceFloatingLabelEditPartPCN.VISUAL_ID:
-				return getInterface_FloatingNameLabel_CN_Parser();
-
-			case PropertyPartNameEditPartCN.VISUAL_ID:
-				return getProperty_NameLabel_Parser();
-
-			case UsageNameEditPart.VISUAL_ID:
-				return getUsage_NameLabel_Parser();
-			case UsageAppliedStereotypeEditPart.VISUAL_ID:
-				return getUsage_StereotypeLabel_Parser();
-
-			case InterfaceRealizationNameEditPart.VISUAL_ID:
-				return getInterfaceRealization_NameLabel_Parser();
-			case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:
-				return getInterfaceRealization_StereotypeLabel_Parser();
-
-			case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:
-				return getGeneralization_StereotypeLabel_Parser();
-
-			case SubstitutionNameEditPart.VISUAL_ID:
-				return getSubstitution_NameLabel_Parser();
-			case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:
-				return getSubstitution_StereotypeLabel_Parser();
-
-			case ManifestationNameEditPart.VISUAL_ID:
-				return getManifestation_NameLabel_Parser();
-			case ManifestationAppliedStereotypeEditPart.VISUAL_ID:
-				return getManifestation_StereotypeLabel_Parser();
-
-			case ComponentRealizationNameEditPart.VISUAL_ID:
-				return getComponentRealization_NameLabel_Parser();
-			case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:
-				return getComponentRealization_StereotypeLabel_Parser();
-
-			case AbstractionNameEditPart.VISUAL_ID:
-				return getAbstraction_NameLabel_Parser();
-			case AbstractionAppliedStereotypeEditPart.VISUAL_ID:
-				return getAbstraction_StereotypeLabel_Parser();
-
-			case DependencyNameEditPart.VISUAL_ID:
-				return getDependency_NameLabel_Parser();
-			case DependencyAppliedStereotypeEditPart.VISUAL_ID:
-				return getDependency_StereotypeLabel_Parser();
-
-			case ConnectorAppliedStereotypeEditPart.VISUAL_ID:
-				return getConnector_StereotypeLabel_Parser();
-			case ConnectorNameEditPart.VISUAL_ID:
-				return getConnector_NameLabel_Parser();
-
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Utility method that consults ParserService
-	 *
-	 * @generated
-	 */
-	public static IParser getParser(IElementType type, EObject object, String parserHint) {
-		return ParserService.getInstance().getParser(new HintAdapter(type, object, parserHint));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser(IAdaptable hint) {
-		String vid = (String) hint.getAdapter(String.class);
-		if (vid != null) {
-			return getParser(UMLVisualIDRegistry.getVisualID(vid));
-		}
-		View view = (View) hint.getAdapter(View.class);
-		if (view != null) {
-			return getParser(UMLVisualIDRegistry.getVisualID(view));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean provides(IOperation operation) {
-		if (operation instanceof GetParserOperation) {
-			IAdaptable hint = ((GetParserOperation) operation).getHint();
-			if (UMLElementTypes.getElement(hint) == null) {
-				return false;
-			}
-			return getParser(hint) != null;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class HintAdapter extends ParserHintAdapter {
-
-		/**
-		 * @generated
-		 */
-		private final IElementType elementType;
-
-		/**
-		 * @generated
-		 */
-		public HintAdapter(IElementType type, EObject object, String parserHint) {
-			super(object, parserHint);
-			assert type != null;
-			elementType = type;
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
-			if (IElementType.class.equals(adapter)) {
-				return elementType;
-			}
-			return super.getAdapter(adapter);
-		}
-	}
-}
+/**

+ * 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.component.providers;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

+import org.eclipse.gmf.runtime.common.core.service.IOperation;

+import org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.parser.CommentParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentBodyEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentFloatingLabelEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentNameEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintNameEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintSpecificationEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DefaultNamedElementNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeFloatingLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceFloatingLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceFloatingLabelEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceNameEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.MultiDependencyLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceFloatingLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceFloatingLabelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.parsers.MessageFormatParser;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class UMLParserProvider extends AbstractProvider implements IParserProvider {

+

+	/**

+	 * @generated

+	 */

+	private IParser dependency_MultiNameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDependency_MultiNameLabel_Parser() {

+		if (dependency_MultiNameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			dependency_MultiNameLabel_Parser = parser;

+		}

+		return dependency_MultiNameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser dependency_FloatingNameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDependency_FloatingNameLabel_Parser() {

+		if (dependency_FloatingNameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			dependency_FloatingNameLabel_Parser = parser;

+		}

+		return dependency_FloatingNameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser component_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponent_NameLabel_Parser() {

+		if (component_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			component_NameLabel_Parser = parser;

+		}

+		return component_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser component_FloatingNameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponent_FloatingNameLabel_Parser() {

+		if (component_FloatingNameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			component_FloatingNameLabel_Parser = parser;

+		}

+		return component_FloatingNameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser model_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getModel_NameLabel_Parser() {

+		if (model_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			model_NameLabel_Parser = parser;

+		}

+		return model_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser package_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getPackage_NameLabel_Parser() {

+		if (package_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			package_NameLabel_Parser = parser;

+		}

+		return package_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interface_ClassifierNameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterface_ClassifierNameLabel_Parser() {

+		if (interface_ClassifierNameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			interface_ClassifierNameLabel_Parser = parser;

+		}

+		return interface_ClassifierNameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interface_ClassifierFloatingNameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterface_ClassifierFloatingNameLabel_Parser() {

+		if (interface_ClassifierFloatingNameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			interface_ClassifierFloatingNameLabel_Parser = parser;

+		}

+		return interface_ClassifierFloatingNameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private CommentParser comment_BodyLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComment_BodyLabel_Parser() {

+		if (comment_BodyLabel_Parser == null) {

+			comment_BodyLabel_Parser = new CommentParser();

+		}

+		return comment_BodyLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser constraint_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConstraint_NameLabel_Parser() {

+		if (constraint_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			constraint_NameLabel_Parser = parser;

+		}

+		return constraint_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ConstraintParser constraint_BodyLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConstraint_BodyLabel_Parser() {

+		if (constraint_BodyLabel_Parser == null) {

+			constraint_BodyLabel_Parser = new ConstraintParser();

+		}

+		return constraint_BodyLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser namedElement_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getNamedElement_NameLabel_Parser() {

+		if (namedElement_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			namedElement_NameLabel_Parser = parser;

+		}

+		return namedElement_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interface_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterface_NameLabel_Parser() {

+		if (interface_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			interface_NameLabel_Parser = parser;

+		}

+		return interface_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interface_FloatingNameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterface_FloatingNameLabel_Parser() {

+		if (interface_FloatingNameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			interface_FloatingNameLabel_Parser = parser;

+		}

+		return interface_FloatingNameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser port_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getPort_NameLabel_Parser() {

+		if (port_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			port_NameLabel_Parser = parser;

+		}

+		return port_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser port_StereotypeLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getPort_StereotypeLabel_Parser() {

+		if (port_StereotypeLabel_Parser == null) {

+			port_StereotypeLabel_Parser = new AppliedStereotypeParser();

+		}

+		return port_StereotypeLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser model_NameLabel_CN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getModel_NameLabel_CN_Parser() {

+		if (model_NameLabel_CN_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			model_NameLabel_CN_Parser = parser;

+		}

+		return model_NameLabel_CN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser package_NameLabel_CN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getPackage_NameLabel_CN_Parser() {

+		if (package_NameLabel_CN_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			package_NameLabel_CN_Parser = parser;

+		}

+		return package_NameLabel_CN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interface_ClassifierNameLabel_CN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterface_ClassifierNameLabel_CN_Parser() {

+		if (interface_ClassifierNameLabel_CN_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			interface_ClassifierNameLabel_CN_Parser = parser;

+		}

+		return interface_ClassifierNameLabel_CN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interface_ClassifierFloatingNameLabel_CN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterface_ClassifierFloatingNameLabel_CN_Parser() {

+		if (interface_ClassifierFloatingNameLabel_CN_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			interface_ClassifierFloatingNameLabel_CN_Parser = parser;

+		}

+		return interface_ClassifierFloatingNameLabel_CN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser component_NameLabel_CCN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponent_NameLabel_CCN_Parser() {

+		if (component_NameLabel_CCN_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			component_NameLabel_CCN_Parser = parser;

+		}

+		return component_NameLabel_CCN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser component_FloatingNameLabel_CCN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponent_FloatingNameLabel_CCN_Parser() {

+		if (component_FloatingNameLabel_CCN_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			component_FloatingNameLabel_CCN_Parser = parser;

+		}

+		return component_FloatingNameLabel_CCN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser component_NameLabel_CN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponent_NameLabel_CN_Parser() {

+		if (component_NameLabel_CN_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			component_NameLabel_CN_Parser = parser;

+		}

+		return component_NameLabel_CN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser component_FloatingNameLabel_CN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponent_FloatingNameLabel_CN_Parser() {

+		if (component_FloatingNameLabel_CN_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			component_FloatingNameLabel_CN_Parser = parser;

+		}

+		return component_FloatingNameLabel_CN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private CommentParser comment_BodyLabel_CN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComment_BodyLabel_CN_Parser() {

+		if (comment_BodyLabel_CN_Parser == null) {

+			comment_BodyLabel_CN_Parser = new CommentParser();

+		}

+		return comment_BodyLabel_CN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser constraint_NameLabel_CN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConstraint_NameLabel_CN_Parser() {

+		if (constraint_NameLabel_CN_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			constraint_NameLabel_CN_Parser = parser;

+		}

+		return constraint_NameLabel_CN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ConstraintParser constraint_BodyLabel_CN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConstraint_BodyLabel_CN_Parser() {

+		if (constraint_BodyLabel_CN_Parser == null) {

+			constraint_BodyLabel_CN_Parser = new ConstraintParser();

+		}

+		return constraint_BodyLabel_CN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser property_InterfaceAttributeLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getProperty_InterfaceAttributeLabel_Parser() {

+		if (property_InterfaceAttributeLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			property_InterfaceAttributeLabel_Parser = parser;

+		}

+		return property_InterfaceAttributeLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser operation_InterfaceOperationLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getOperation_InterfaceOperationLabel_Parser() {

+		if (operation_InterfaceOperationLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			operation_InterfaceOperationLabel_Parser = parser;

+		}

+		return operation_InterfaceOperationLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser reception_InterfaceReceptionLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getReception_InterfaceReceptionLabel_Parser() {

+		if (reception_InterfaceReceptionLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("\u00ABSignal\u00BB {0}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			reception_InterfaceReceptionLabel_Parser = parser;

+		}

+		return reception_InterfaceReceptionLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interface_NameLabel_CN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterface_NameLabel_CN_Parser() {

+		if (interface_NameLabel_CN_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			interface_NameLabel_CN_Parser = parser;

+		}

+		return interface_NameLabel_CN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interface_FloatingNameLabel_CN_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterface_FloatingNameLabel_CN_Parser() {

+		if (interface_FloatingNameLabel_CN_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			interface_FloatingNameLabel_CN_Parser = parser;

+		}

+		return interface_FloatingNameLabel_CN_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser property_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getProperty_NameLabel_Parser() {

+		if (property_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			property_NameLabel_Parser = parser;

+		}

+		return property_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser usage_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getUsage_NameLabel_Parser() {

+		if (usage_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			usage_NameLabel_Parser = parser;

+		}

+		return usage_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser usage_StereotypeLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getUsage_StereotypeLabel_Parser() {

+		if (usage_StereotypeLabel_Parser == null) {

+			usage_StereotypeLabel_Parser = new AppliedStereotypeParser();

+		}

+		return usage_StereotypeLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interfaceRealization_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterfaceRealization_NameLabel_Parser() {

+		if (interfaceRealization_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			interfaceRealization_NameLabel_Parser = parser;

+		}

+		return interfaceRealization_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser interfaceRealization_StereotypeLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterfaceRealization_StereotypeLabel_Parser() {

+		if (interfaceRealization_StereotypeLabel_Parser == null) {

+			interfaceRealization_StereotypeLabel_Parser = new AppliedStereotypeParser();

+		}

+		return interfaceRealization_StereotypeLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser generalization_StereotypeLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getGeneralization_StereotypeLabel_Parser() {

+		if (generalization_StereotypeLabel_Parser == null) {

+			generalization_StereotypeLabel_Parser = new AppliedStereotypeParser();

+		}

+		return generalization_StereotypeLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser substitution_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSubstitution_NameLabel_Parser() {

+		if (substitution_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			substitution_NameLabel_Parser = parser;

+		}

+		return substitution_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser substitution_StereotypeLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSubstitution_StereotypeLabel_Parser() {

+		if (substitution_StereotypeLabel_Parser == null) {

+			substitution_StereotypeLabel_Parser = new AppliedStereotypeParser();

+		}

+		return substitution_StereotypeLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser manifestation_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getManifestation_NameLabel_Parser() {

+		if (manifestation_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			manifestation_NameLabel_Parser = parser;

+		}

+		return manifestation_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser manifestation_StereotypeLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getManifestation_StereotypeLabel_Parser() {

+		if (manifestation_StereotypeLabel_Parser == null) {

+			manifestation_StereotypeLabel_Parser = new AppliedStereotypeParser();

+		}

+		return manifestation_StereotypeLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser componentRealization_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponentRealization_NameLabel_Parser() {

+		if (componentRealization_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			componentRealization_NameLabel_Parser = parser;

+		}

+		return componentRealization_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser componentRealization_StereotypeLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponentRealization_StereotypeLabel_Parser() {

+		if (componentRealization_StereotypeLabel_Parser == null) {

+			componentRealization_StereotypeLabel_Parser = new AppliedStereotypeParser();

+		}

+		return componentRealization_StereotypeLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser abstraction_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getAbstraction_NameLabel_Parser() {

+		if (abstraction_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			abstraction_NameLabel_Parser = parser;

+		}

+		return abstraction_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser abstraction_StereotypeLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getAbstraction_StereotypeLabel_Parser() {

+		if (abstraction_StereotypeLabel_Parser == null) {

+			abstraction_StereotypeLabel_Parser = new AppliedStereotypeParser();

+		}

+		return abstraction_StereotypeLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser dependency_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDependency_NameLabel_Parser() {

+		if (dependency_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			dependency_NameLabel_Parser = parser;

+		}

+		return dependency_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser dependency_StereotypeLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDependency_StereotypeLabel_Parser() {

+		if (dependency_StereotypeLabel_Parser == null) {

+			dependency_StereotypeLabel_Parser = new AppliedStereotypeParser();

+		}

+		return dependency_StereotypeLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser connector_StereotypeLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConnector_StereotypeLabel_Parser() {

+		if (connector_StereotypeLabel_Parser == null) {

+			connector_StereotypeLabel_Parser = new AppliedStereotypeParser();

+		}

+		return connector_StereotypeLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser connector_NameLabel_Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConnector_NameLabel_Parser() {

+		if (connector_NameLabel_Parser == null) {

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			connector_NameLabel_Parser = parser;

+		}

+		return connector_NameLabel_Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IParser getParser(String visualID) {

+		if (visualID != null) {

+			switch (visualID) {

+			case MultiDependencyLabelEditPart.VISUAL_ID:

+				return getDependency_MultiNameLabel_Parser();

+			case DependencyNodeFloatingLabelEditPart.VISUAL_ID:

+				return getDependency_FloatingNameLabel_Parser();

+

+			case ComponentNameEditPart.VISUAL_ID:

+				return getComponent_NameLabel_Parser();

+			case ComponentFloatingLabelEditPart.VISUAL_ID:

+				return getComponent_FloatingNameLabel_Parser();

+

+			case ModelNameEditPart.VISUAL_ID:

+				return getModel_NameLabel_Parser();

+

+			case PackageNameEditPart.VISUAL_ID:

+				return getPackage_NameLabel_Parser();

+

+			case RectangleInterfaceNameEditPart.VISUAL_ID:

+				return getInterface_ClassifierNameLabel_Parser();

+			case RectangleInterfaceFloatingLabelEditPart.VISUAL_ID:

+				return getInterface_ClassifierFloatingNameLabel_Parser();

+

+			case CommentBodyEditPart.VISUAL_ID:

+				return getComment_BodyLabel_Parser();

+

+			case ConstraintNameEditPart.VISUAL_ID:

+				return getConstraint_NameLabel_Parser();

+			case ConstraintSpecificationEditPart.VISUAL_ID:

+				return getConstraint_BodyLabel_Parser();

+

+			case DefaultNamedElementNameEditPart.VISUAL_ID:

+				return getNamedElement_NameLabel_Parser();

+

+			case InterfaceNameEditPart.VISUAL_ID:

+				return getInterface_NameLabel_Parser();

+			case InterfaceFloatingLabelEditPart.VISUAL_ID:

+				return getInterface_FloatingNameLabel_Parser();

+

+			case PortNameEditPart.VISUAL_ID:

+				return getPort_NameLabel_Parser();

+			case PortAppliedStereotypeEditPart.VISUAL_ID:

+				return getPort_StereotypeLabel_Parser();

+

+			case ModelNameEditPartCN.VISUAL_ID:

+				return getModel_NameLabel_CN_Parser();

+

+			case PackageNameEditPartCN.VISUAL_ID:

+				return getPackage_NameLabel_CN_Parser();

+

+			case RectangleInterfaceNameEditPartCN.VISUAL_ID:

+				return getInterface_ClassifierNameLabel_CN_Parser();

+			case RectangleInterfaceFloatingLabelEditPartCN.VISUAL_ID:

+				return getInterface_ClassifierFloatingNameLabel_CN_Parser();

+

+			case ComponentNameEditPartCN.VISUAL_ID:

+				return getComponent_NameLabel_CCN_Parser();

+			case ComponentFloatingLabelEditPartCN.VISUAL_ID:

+				return getComponent_FloatingNameLabel_CCN_Parser();

+

+			case ComponentNameEditPartPCN.VISUAL_ID:

+				return getComponent_NameLabel_CN_Parser();

+			case ComponentFloatingLabelEditPartPCN.VISUAL_ID:

+				return getComponent_FloatingNameLabel_CN_Parser();

+

+			case CommentBodyEditPartPCN.VISUAL_ID:

+				return getComment_BodyLabel_CN_Parser();

+

+			case ConstraintNameEditPartPCN.VISUAL_ID:

+				return getConstraint_NameLabel_CN_Parser();

+			case ConstraintSpecificationEditPartPCN.VISUAL_ID:

+				return getConstraint_BodyLabel_CN_Parser();

+

+			case PropertyForInterfaceEditPart.VISUAL_ID:

+				return getProperty_InterfaceAttributeLabel_Parser();

+			case OperationForInterfaceEditPart.VISUAL_ID:

+				return getOperation_InterfaceOperationLabel_Parser();

+			case ReceptionInInterfaceEditPart.VISUAL_ID:

+				return getReception_InterfaceReceptionLabel_Parser();

+			case InterfaceNameEditPartPCN.VISUAL_ID:

+				return getInterface_NameLabel_CN_Parser();

+			case InterfaceFloatingLabelEditPartPCN.VISUAL_ID:

+				return getInterface_FloatingNameLabel_CN_Parser();

+

+			case PropertyPartNameEditPartCN.VISUAL_ID:

+				return getProperty_NameLabel_Parser();

+

+			case UsageNameEditPart.VISUAL_ID:

+				return getUsage_NameLabel_Parser();

+			case UsageAppliedStereotypeEditPart.VISUAL_ID:

+				return getUsage_StereotypeLabel_Parser();

+

+			case InterfaceRealizationNameEditPart.VISUAL_ID:

+				return getInterfaceRealization_NameLabel_Parser();

+			case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:

+				return getInterfaceRealization_StereotypeLabel_Parser();

+

+			case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:

+				return getGeneralization_StereotypeLabel_Parser();

+

+			case SubstitutionNameEditPart.VISUAL_ID:

+				return getSubstitution_NameLabel_Parser();

+			case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:

+				return getSubstitution_StereotypeLabel_Parser();

+

+			case ManifestationNameEditPart.VISUAL_ID:

+				return getManifestation_NameLabel_Parser();

+			case ManifestationAppliedStereotypeEditPart.VISUAL_ID:

+				return getManifestation_StereotypeLabel_Parser();

+

+			case ComponentRealizationNameEditPart.VISUAL_ID:

+				return getComponentRealization_NameLabel_Parser();

+			case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:

+				return getComponentRealization_StereotypeLabel_Parser();

+

+			case AbstractionNameEditPart.VISUAL_ID:

+				return getAbstraction_NameLabel_Parser();

+			case AbstractionAppliedStereotypeEditPart.VISUAL_ID:

+				return getAbstraction_StereotypeLabel_Parser();

+

+			case DependencyNameEditPart.VISUAL_ID:

+				return getDependency_NameLabel_Parser();

+			case DependencyAppliedStereotypeEditPart.VISUAL_ID:

+				return getDependency_StereotypeLabel_Parser();

+

+			case ConnectorAppliedStereotypeEditPart.VISUAL_ID:

+				return getConnector_StereotypeLabel_Parser();

+			case ConnectorNameEditPart.VISUAL_ID:

+				return getConnector_NameLabel_Parser();

+

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Utility method that consults ParserService

+	 *

+	 * @generated

+	 */

+	public static IParser getParser(IElementType type, EObject object, String parserHint) {

+		return ParserService.getInstance().getParser(new HintAdapter(type, object, parserHint));

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser(IAdaptable hint) {

+		String vid = (String) hint.getAdapter(String.class);

+		if (vid != null) {

+			return getParser(UMLVisualIDRegistry.getVisualID(vid));

+		}

+		View view = (View) hint.getAdapter(View.class);

+		if (view != null) {

+			return getParser(UMLVisualIDRegistry.getVisualID(view));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean provides(IOperation operation) {

+		if (operation instanceof GetParserOperation) {

+			IAdaptable hint = ((GetParserOperation) operation).getHint();

+			if (UMLElementTypes.getElement(hint) == null) {

+				return false;

+			}

+			return getParser(hint) != null;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class HintAdapter extends ParserHintAdapter {

+

+		/**

+		 * @generated

+		 */

+		private final IElementType elementType;

+

+		/**

+		 * @generated

+		 */

+		public HintAdapter(IElementType type, EObject object, String parserHint) {

+			super(object, parserHint);

+			assert type != null;

+			elementType = type;

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {

+			if (IElementType.class.equals(adapter)) {

+				return elementType;

+			}

+			return super.getAdapter(adapter);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLValidationDecoratorProvider.java
index a3f7ae79ac7..be75640640d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLValidationDecoratorProvider.java
@@ -1,71 +1,71 @@
-/**
- * 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.component.providers;
-
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-
-/**
- * @generated
- */
-public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider implements IDecoratorProvider {
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void createDecorators(IDecoratorTarget decoratorTarget) {
-		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;
-				if (!(view instanceof Edge) && !view.isSetElement()) {
-					return;
-				}
-			}
-			EditDomain ed = editPart.getViewer().getEditDomain();
-			if (!(ed instanceof DiagramEditDomain)) {
-				return;
-			}
-			if (((DiagramEditDomain) ed).getEditorPart() instanceof UMLDiagramEditor) {
-				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean provides(IOperation operation) {
-		if (!(operation instanceof CreateDecoratorsOperation)) {
-			return false;
-		}
-		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget();
-		View view = (View) decoratorTarget.getAdapter(View.class);
-		return view != null && ComponentDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));
-	}
-}
+/**

+ * 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.component.providers;

+

+import org.eclipse.gef.EditDomain;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.editparts.AbstractConnectionEditPart;

+import org.eclipse.gmf.runtime.common.core.service.IOperation;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider implements IDecoratorProvider {

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void createDecorators(IDecoratorTarget decoratorTarget) {

+		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;

+				if (!(view instanceof Edge) && !view.isSetElement()) {

+					return;

+				}

+			}

+			EditDomain ed = editPart.getViewer().getEditDomain();

+			if (!(ed instanceof DiagramEditDomain)) {

+				return;

+			}

+			if (((DiagramEditDomain) ed).getEditorPart() instanceof UMLDiagramEditor) {

+				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean provides(IOperation operation) {

+		if (!(operation instanceof CreateDecoratorsOperation)) {

+			return false;

+		}

+		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget();

+		View view = (View) decoratorTarget.getAdapter(View.class);

+		return view != null && ComponentDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLValidationProvider.java
index 1478da1587f..ecf0b8928ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLValidationProvider.java
@@ -1,77 +1,77 @@
-/**
- * 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.component.providers;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-
-/**
- * @generated
- */
-public class UMLValidationProvider {
-
-	/**
-	 * @generated
-	 */
-	private static boolean constraintsActive = false;
-
-	/**
-	 * @generated
-	 */
-	public static boolean shouldConstraintsBePrivate() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void runWithConstraints(TransactionalEditingDomain editingDomain, Runnable operation) {
-		final Runnable op = operation;
-		Runnable task = new Runnable() {
-			@Override
-			public void run() {
-				try {
-					constraintsActive = true;
-					op.run();
-				} finally {
-					constraintsActive = false;
-				}
-			}
-		};
-		if (editingDomain != null) {
-			try {
-				editingDomain.runExclusive(task);
-			} catch (Exception e) {
-				UMLDiagramEditorPlugin.getInstance().logError("Validation failed", e); //$NON-NLS-1$
-			}
-		} else {
-			task.run();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	static boolean isInDefaultEditorContext(Object object) {
-		if (shouldConstraintsBePrivate() && !constraintsActive) {
-			return false;
-		}
-		if (object instanceof View) {
-			return constraintsActive
-					&& ComponentDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View) object));
-		}
-		return true;
-	}
-}
+/**

+ * 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.component.providers;

+

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class UMLValidationProvider {

+

+	/**

+	 * @generated

+	 */

+	private static boolean constraintsActive = false;

+

+	/**

+	 * @generated

+	 */

+	public static boolean shouldConstraintsBePrivate() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void runWithConstraints(TransactionalEditingDomain editingDomain, Runnable operation) {

+		final Runnable op = operation;

+		Runnable task = new Runnable() {

+			@Override

+			public void run() {

+				try {

+					constraintsActive = true;

+					op.run();

+				} finally {

+					constraintsActive = false;

+				}

+			}

+		};

+		if (editingDomain != null) {

+			try {

+				editingDomain.runExclusive(task);

+			} catch (Exception e) {

+				UMLDiagramEditorPlugin.getInstance().logError("Validation failed", e); //$NON-NLS-1$

+			}

+		} else {

+			task.run();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	static boolean isInDefaultEditorContext(Object object) {

+		if (shouldConstraintsBePrivate() && !constraintsActive) {

+			return false;

+		}

+		if (object instanceof View) {

+			return constraintsActive

+					&& ComponentDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View) object));

+		}

+		return true;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
index 054e653d13d..0293b3ae55b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
@@ -183,20 +183,23 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */

 	protected boolean provides(CreateViewForKindOperation op) {

 		/*

-		 * if (op.getViewKind() == Node.class)

-		 * return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

-		 * if (op.getViewKind() == Edge.class)

-		 * return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

-		 */

+		    if (op.getViewKind() == Node.class)

+		return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

+		    if (op.getViewKind() == Edge.class)

+		return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

+		*/

+

 		// check Diagram Type should be the class diagram

 		String modelID = UMLVisualIDRegistry.getModelID(op.getContainerView());

 		if (!getDiagramProvidedId().equals(modelID)) {

 			return false;

 		}

+

 		String visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());

 		if (Node.class.isAssignableFrom(op.getViewKind())) {

 			return UMLVisualIDRegistry.canCreateNode(op.getContainerView(), visualID);

 		}

+

 		return true;

 	}

 

@@ -205,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 ComponentDiagramEditPart.MODEL_ID;

 	}

 

@@ -219,7 +222,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected boolean provides(CreateDiagramViewOperation op) {

-		return ComponentDiagramEditPart.MODEL_ID.equals(op.getSemanticHint()) && UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != null

+		return ComponentDiagramEditPart.MODEL_ID.equals(op.getSemanticHint())

+				&& UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != null

 				&& !UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())).isEmpty();

 	}

 

@@ -244,16 +248,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		} else {

 			visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());

 			if (elementType != null) {

+

 				if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {

 					return false; // foreign element type

 				}

+

 				String elementTypeHint = ((IHintedType) elementType).getSemanticHint();

 				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.component.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.component.part.UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) {

+				//	return false; // visual id for node EClass should match visual id from element type

+				//}

 			} else {

 				if (!ComponentDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) {

 					return false; // foreign diagram

@@ -282,7 +288,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 					case CommentEditPartPCN.VISUAL_ID:

 					case ConstraintEditPartPCN.VISUAL_ID:

 					case InterfaceEditPartPCN.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;

@@ -292,6 +299,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				}

 			}

 		}

+

 		return UMLVisualIDRegistry.canCreateNode(op.getContainerView(), visualID);

 	}

 

@@ -300,18 +308,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */

 	protected boolean provides(CreateEdgeViewOperation op) {

 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());

+

 		if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {

 			return false; // foreign element type

 		}

+

 		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.component.part.UMLVisualIDRegistry.getVisualID(elementTypeHint);

-		// org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter());

-		// if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.component.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.component.part.UMLVisualIDRegistry.getVisualID(elementTypeHint);

+		//org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter());

+		//if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry.getLinkWithClassVisualID(domainElement))) {

+		//	return false; // visual id for link EClass should match visual id from element type

+		//}

 		return true;

 	}

 

@@ -334,7 +345,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) {

@@ -347,7 +359,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case DependencyNodeEditPart.VISUAL_ID:

 				return createDependency_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case ComponentEditPart.VISUAL_ID:

-				return createComponent_PackagedElementShape(domainElement, containerView, index, persisted, preferencesHint);

+				return createComponent_PackagedElementShape(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case ModelEditPart.VISUAL_ID:

 				return createModel_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case PackageEditPart.VISUAL_ID:

@@ -369,21 +382,27 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case PackageEditPartCN.VISUAL_ID:

 				return createPackage_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case RectangleInterfaceEditPartCN.VISUAL_ID:

-				return createInterface_ClassifierShape_CN(domainElement, containerView, index, persisted, preferencesHint);

+				return createInterface_ClassifierShape_CN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case ComponentEditPartCN.VISUAL_ID:

-				return createComponent_PackagedElementShape_CCN(domainElement, containerView, index, persisted, preferencesHint);

+				return createComponent_PackagedElementShape_CCN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case ComponentEditPartPCN.VISUAL_ID:

-				return createComponent_PackagedElementShape_CN(domainElement, containerView, index, persisted, preferencesHint);

+				return createComponent_PackagedElementShape_CN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case CommentEditPartPCN.VISUAL_ID:

 				return createComment_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case ConstraintEditPartPCN.VISUAL_ID:

 				return createConstraint_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case PropertyForInterfaceEditPart.VISUAL_ID:

-				return createProperty_InterfaceAttributeLabel(domainElement, containerView, index, persisted, preferencesHint);

+				return createProperty_InterfaceAttributeLabel(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case OperationForInterfaceEditPart.VISUAL_ID:

-				return createOperation_InterfaceOperationLabel(domainElement, containerView, index, persisted, preferencesHint);

+				return createOperation_InterfaceOperationLabel(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case ReceptionInInterfaceEditPart.VISUAL_ID:

-				return createReception_InterfaceReceptionLabel(domainElement, containerView, index, persisted, preferencesHint);

+				return createReception_InterfaceReceptionLabel(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case InterfaceEditPartPCN.VISUAL_ID:

 				return createInterface_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case PropertyPartEditPartCN.VISUAL_ID:

@@ -398,26 +417,34 @@ 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);

 		if (vid != null) {

 			switch (vid) {

 			case UsageEditPart.VISUAL_ID:

-				return createUsage_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createUsage_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted,

+						preferencesHint);

 			case InterfaceRealizationEditPart.VISUAL_ID:

-				return createInterfaceRealization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createInterfaceRealization_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 SubstitutionEditPart.VISUAL_ID:

-				return createSubstitution_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createSubstitution_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 ComponentRealizationEditPart.VISUAL_ID:

-				return createComponentRealization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createComponentRealization_Edge(getSemanticElement(semanticAdapter), containerView, index,

+						persisted, preferencesHint);

 			case AbstractionEditPart.VISUAL_ID:

-				return createAbstraction_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createAbstraction_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted,

+						preferencesHint);

 			case LinkDescriptorEditPart.VISUAL_ID:

 				return createLink_DescriptorEdge(containerView, index, persisted, preferencesHint);

 			case CommentAnnotatedElementEditPart.VISUAL_ID:

@@ -425,13 +452,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case ConstraintConstrainedElementEditPart.VISUAL_ID:

 				return createConstraint_ConstrainedElementEdge(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 InterfacePortLinkEditPart.VISUAL_ID:

 				return createLink_InterfacePortEdge(containerView, index, persisted, preferencesHint);

 			case ConnectorEditPart.VISUAL_ID:

-				return createConnector_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createConnector_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted,

+						preferencesHint);

 			}

 		}

 		// can never happen, provided #provides(CreateEdgeViewOperation) is correct

@@ -441,22 +471,26 @@ 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);

-		Node dependency_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(DependencyNodeFloatingLabelEditPart.VISUAL_ID));

+		Node dependency_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DependencyNodeFloatingLabelEditPart.VISUAL_ID));

 		dependency_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location dependency_FloatingNameLabel_Location = (Location) dependency_FloatingNameLabel.getLayoutConstraint();

 		dependency_FloatingNameLabel_Location.setX(0);

@@ -467,23 +501,27 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createComponent_PackagedElementShape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createComponent_PackagedElementShape(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(ComponentEditPart.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, "Component");

 		Node component_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ComponentNameEditPart.VISUAL_ID));

-		Node component_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(ComponentFloatingLabelEditPart.VISUAL_ID));

+		Node component_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ComponentFloatingLabelEditPart.VISUAL_ID));

 		component_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location component_FloatingNameLabel_Location = (Location) component_FloatingNameLabel.getLayoutConstraint();

 		component_FloatingNameLabel_Location.setX(0);

 		component_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPart.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

 		return node;

 	}

@@ -491,18 +529,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @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;

 	}

@@ -510,18 +551,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;

 	}

@@ -529,24 +573,31 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createInterface_ClassifierShape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInterface_ClassifierShape(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(RectangleInterfaceEditPart.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, "Interface");

-		Node interface_ClassifierNameLabel = createLabel(node, UMLVisualIDRegistry.getType(RectangleInterfaceNameEditPart.VISUAL_ID));

-		Node interface_ClassifierFloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(RectangleInterfaceFloatingLabelEditPart.VISUAL_ID));

+		Node interface_ClassifierNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(RectangleInterfaceNameEditPart.VISUAL_ID));

+		Node interface_ClassifierFloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(RectangleInterfaceFloatingLabelEditPart.VISUAL_ID));

 		interface_ClassifierFloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location interface_ClassifierFloatingNameLabel_Location = (Location) interface_ClassifierFloatingNameLabel.getLayoutConstraint();

+		Location interface_ClassifierFloatingNameLabel_Location = (Location) interface_ClassifierFloatingNameLabel

+				.getLayoutConstraint();

 		interface_ClassifierFloatingNameLabel_Location.setX(0);

 		interface_ClassifierFloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID), true, true, true, true);

+		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPart.VISUAL_ID), true,

+				true, true, true);

+		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID), true,

+				true, true, true);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interface");

 		return node;

 	}

@@ -554,15 +605,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @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");

 		Node comment_BodyLabel = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));

 		return node;

@@ -571,57 +624,66 @@ 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 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 createInterface_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInterface_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(InterfaceEditPart.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, "Interface");

 		Node interface_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));

 		interface_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location interface_NameLabel_Location = (Location) interface_NameLabel.getLayoutConstraint();

 		interface_NameLabel_Location.setX(0);

 		interface_NameLabel_Location.setY(5);

-		Node interface_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(InterfaceFloatingLabelEditPart.VISUAL_ID));

+		Node interface_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(InterfaceFloatingLabelEditPart.VISUAL_ID));

 		interface_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location interface_FloatingNameLabel_Location = (Location) interface_FloatingNameLabel.getLayoutConstraint();

 		interface_FloatingNameLabel_Location.setX(0);

@@ -633,21 +695,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createPort_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createPort_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(PortEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Port");

 		Node port_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(PortNameEditPart.VISUAL_ID));

 		port_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location port_NameLabel_Location = (Location) port_NameLabel.getLayoutConstraint();

 		port_NameLabel_Location.setX(0);

 		port_NameLabel_Location.setY(5);

-		Node port_StereotypeLabel = createLabel(node, UMLVisualIDRegistry.getType(PortAppliedStereotypeEditPart.VISUAL_ID));

+		Node port_StereotypeLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(PortAppliedStereotypeEditPart.VISUAL_ID));

 		port_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location port_StereotypeLabel_Location = (Location) port_StereotypeLabel.getLayoutConstraint();

 		port_StereotypeLabel_Location.setX(25);

@@ -659,17 +724,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;

 	}

@@ -677,17 +745,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;

 	}

@@ -695,23 +766,30 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createInterface_ClassifierShape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInterface_ClassifierShape_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(RectangleInterfaceEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");

-		Node interface_ClassifierNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(RectangleInterfaceNameEditPartCN.VISUAL_ID));

-		Node interface_ClassifierFloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(RectangleInterfaceFloatingLabelEditPartCN.VISUAL_ID));

+		Node interface_ClassifierNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(RectangleInterfaceNameEditPartCN.VISUAL_ID));

+		Node interface_ClassifierFloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(RectangleInterfaceFloatingLabelEditPartCN.VISUAL_ID));

 		interface_ClassifierFloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location interface_ClassifierFloatingNameLabel_CN_Location = (Location) interface_ClassifierFloatingNameLabel_CN.getLayoutConstraint();

+		Location interface_ClassifierFloatingNameLabel_CN_Location = (Location) interface_ClassifierFloatingNameLabel_CN

+				.getLayoutConstraint();

 		interface_ClassifierFloatingNameLabel_CN_Location.setX(0);

 		interface_ClassifierFloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

+		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPartCN.VISUAL_ID), true,

+				true, true, true);

+		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID), true,

+				true, true, true);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interface");

 		return node;

 	}

@@ -719,22 +797,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createComponent_PackagedElementShape_CCN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createComponent_PackagedElementShape_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(ComponentEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

-		Node component_NameLabel_CCN = createLabel(node, UMLVisualIDRegistry.getType(ComponentNameEditPartCN.VISUAL_ID));

-		Node component_FloatingNameLabel_CCN = createLabel(node, UMLVisualIDRegistry.getType(ComponentFloatingLabelEditPartCN.VISUAL_ID));

+		Node component_NameLabel_CCN = createLabel(node,

+				UMLVisualIDRegistry.getType(ComponentNameEditPartCN.VISUAL_ID));

+		Node component_FloatingNameLabel_CCN = createLabel(node,

+				UMLVisualIDRegistry.getType(ComponentFloatingLabelEditPartCN.VISUAL_ID));

 		component_FloatingNameLabel_CCN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location component_FloatingNameLabel_CCN_Location = (Location) component_FloatingNameLabel_CCN.getLayoutConstraint();

+		Location component_FloatingNameLabel_CCN_Location = (Location) component_FloatingNameLabel_CCN

+				.getLayoutConstraint();

 		component_FloatingNameLabel_CCN_Location.setX(0);

 		component_FloatingNameLabel_CCN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPartCN.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

 		return node;

 	}

@@ -742,22 +826,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createComponent_PackagedElementShape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createComponent_PackagedElementShape_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(ComponentEditPartPCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

-		Node component_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ComponentNameEditPartPCN.VISUAL_ID));

-		Node component_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ComponentFloatingLabelEditPartPCN.VISUAL_ID));

+		Node component_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ComponentNameEditPartPCN.VISUAL_ID));

+		Node component_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ComponentFloatingLabelEditPartPCN.VISUAL_ID));

 		component_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location component_FloatingNameLabel_CN_Location = (Location) component_FloatingNameLabel_CN.getLayoutConstraint();

+		Location component_FloatingNameLabel_CN_Location = (Location) component_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		component_FloatingNameLabel_CN_Location.setX(0);

 		component_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPartPCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPartPCN.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

 		return node;

 	}

@@ -765,14 +855,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @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(CommentEditPartPCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment");

 		Node comment_BodyLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPartPCN.VISUAL_ID));

 		return node;

@@ -781,29 +873,35 @@ 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(ConstraintEditPartPCN.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(ConstraintNameEditPartPCN.VISUAL_ID));

-		Node constraint_BodyLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ConstraintSpecificationEditPartPCN.VISUAL_ID));

+		Node constraint_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ConstraintNameEditPartPCN.VISUAL_ID));

+		Node constraint_BodyLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ConstraintSpecificationEditPartPCN.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createProperty_InterfaceAttributeLabel(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createProperty_InterfaceAttributeLabel(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		node.setType(UMLVisualIDRegistry.getType(PropertyForInterfaceEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

+

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");

 		return node;

@@ -812,12 +910,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createOperation_InterfaceOperationLabel(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createOperation_InterfaceOperationLabel(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		node.setType(UMLVisualIDRegistry.getType(OperationForInterfaceEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

+

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Operation");

 		return node;

@@ -826,12 +926,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createReception_InterfaceReceptionLabel(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createReception_InterfaceReceptionLabel(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		node.setType(UMLVisualIDRegistry.getType(ReceptionInInterfaceEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

+

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Reception");

 		return node;

@@ -840,23 +942,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createInterface_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInterface_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(InterfaceEditPartPCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");

-		Node interface_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPartPCN.VISUAL_ID));

+		Node interface_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(InterfaceNameEditPartPCN.VISUAL_ID));

 		interface_NameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location interface_NameLabel_CN_Location = (Location) interface_NameLabel_CN.getLayoutConstraint();

 		interface_NameLabel_CN_Location.setX(0);

 		interface_NameLabel_CN_Location.setY(5);

-		Node interface_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InterfaceFloatingLabelEditPartPCN.VISUAL_ID));

+		Node interface_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(InterfaceFloatingLabelEditPartPCN.VISUAL_ID));

 		interface_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location interface_FloatingNameLabel_CN_Location = (Location) interface_FloatingNameLabel_CN.getLayoutConstraint();

+		Location interface_FloatingNameLabel_CN_Location = (Location) interface_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		interface_FloatingNameLabel_CN_Location.setX(0);

 		interface_FloatingNameLabel_CN_Location.setY(5);

 		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(node, prefStore, "Interface");

@@ -866,14 +973,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createProperty_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createProperty_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(PropertyPartEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");

 		Node property_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));

 		return node;

@@ -882,7 +991,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createUsage_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createUsage_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();

@@ -896,21 +1006,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Usage");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node usage_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(UsageNameEditPart.VISUAL_ID));

 		usage_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location usage_NameLabel_Location = (Location) usage_NameLabel.getLayoutConstraint();

 		usage_NameLabel_Location.setX(0);

 		usage_NameLabel_Location.setY(60);

-		Node usage_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(UsageAppliedStereotypeEditPart.VISUAL_ID));

+		Node usage_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(UsageAppliedStereotypeEditPart.VISUAL_ID));

 		usage_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location usage_StereotypeLabel_Location = (Location) usage_StereotypeLabel.getLayoutConstraint();

 		usage_StereotypeLabel_Location.setX(0);

 		usage_StereotypeLabel_Location.setY(30);

+

 		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Usage");

 		return edge;

 	}

@@ -918,7 +1031,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createInterfaceRealization_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createInterfaceRealization_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();

@@ -932,21 +1046,27 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InterfaceRealization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		Node interfaceRealization_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationNameEditPart.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 interfaceRealization_NameLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(InterfaceRealizationNameEditPart.VISUAL_ID));

 		interfaceRealization_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location interfaceRealization_NameLabel_Location = (Location) interfaceRealization_NameLabel.getLayoutConstraint();

+		Location interfaceRealization_NameLabel_Location = (Location) interfaceRealization_NameLabel

+				.getLayoutConstraint();

 		interfaceRealization_NameLabel_Location.setX(0);

 		interfaceRealization_NameLabel_Location.setY(60);

-		Node interfaceRealization_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID));

+		Node interfaceRealization_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID));

 		interfaceRealization_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location interfaceRealization_StereotypeLabel_Location = (Location) interfaceRealization_StereotypeLabel.getLayoutConstraint();

+		Location interfaceRealization_StereotypeLabel_Location = (Location) interfaceRealization_StereotypeLabel

+				.getLayoutConstraint();

 		interfaceRealization_StereotypeLabel_Location.setX(0);

 		interfaceRealization_StereotypeLabel_Location.setY(30);

+

 		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "InterfaceRealization");

 		return edge;

 	}

@@ -954,7 +1074,8 @@ 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();

@@ -968,16 +1089,20 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Generalization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		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);

+

 		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Generalization");

 		return edge;

 	}

@@ -985,7 +1110,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createSubstitution_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createSubstitution_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();

@@ -999,21 +1125,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Substitution");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		Node substitution_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionNameEditPart.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 substitution_NameLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(SubstitutionNameEditPart.VISUAL_ID));

 		substitution_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location substitution_NameLabel_Location = (Location) substitution_NameLabel.getLayoutConstraint();

 		substitution_NameLabel_Location.setX(0);

 		substitution_NameLabel_Location.setY(60);

-		Node substitution_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionAppliedStereotypeEditPart.VISUAL_ID));

+		Node substitution_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(SubstitutionAppliedStereotypeEditPart.VISUAL_ID));

 		substitution_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location substitution_StereotypeLabel_Location = (Location) substitution_StereotypeLabel.getLayoutConstraint();

 		substitution_StereotypeLabel_Location.setX(0);

 		substitution_StereotypeLabel_Location.setY(30);

+

 		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Substitution");

 		return edge;

 	}

@@ -1021,7 +1151,8 @@ 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();

@@ -1035,21 +1166,26 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Manifestation");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		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);

+

 		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Manifestation");

 		return edge;

 	}

@@ -1057,7 +1193,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createComponentRealization_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createComponentRealization_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();

@@ -1071,21 +1208,27 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ComponentRealization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		Node componentRealization_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(ComponentRealizationNameEditPart.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 componentRealization_NameLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(ComponentRealizationNameEditPart.VISUAL_ID));

 		componentRealization_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location componentRealization_NameLabel_Location = (Location) componentRealization_NameLabel.getLayoutConstraint();

+		Location componentRealization_NameLabel_Location = (Location) componentRealization_NameLabel

+				.getLayoutConstraint();

 		componentRealization_NameLabel_Location.setX(0);

 		componentRealization_NameLabel_Location.setY(60);

-		Node componentRealization_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID));

+		Node componentRealization_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID));

 		componentRealization_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location componentRealization_StereotypeLabel_Location = (Location) componentRealization_StereotypeLabel.getLayoutConstraint();

+		Location componentRealization_StereotypeLabel_Location = (Location) componentRealization_StereotypeLabel

+				.getLayoutConstraint();

 		componentRealization_StereotypeLabel_Location.setX(0);

 		componentRealization_StereotypeLabel_Location.setY(30);

+

 		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "ComponentRealization");

 		return edge;

 	}

@@ -1093,7 +1236,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createAbstraction_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createAbstraction_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();

@@ -1107,21 +1251,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Abstraction");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node abstraction_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionNameEditPart.VISUAL_ID));

 		abstraction_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location abstraction_NameLabel_Location = (Location) abstraction_NameLabel.getLayoutConstraint();

 		abstraction_NameLabel_Location.setX(0);

 		abstraction_NameLabel_Location.setY(60);

-		Node abstraction_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionAppliedStereotypeEditPart.VISUAL_ID));

+		Node abstraction_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(AbstractionAppliedStereotypeEditPart.VISUAL_ID));

 		abstraction_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location abstraction_StereotypeLabel_Location = (Location) abstraction_StereotypeLabel.getLayoutConstraint();

 		abstraction_StereotypeLabel_Location.setX(0);

 		abstraction_StereotypeLabel_Location.setY(30);

+

 		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Abstraction");

 		return edge;

 	}

@@ -1129,7 +1276,8 @@ 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();

@@ -1143,17 +1291,20 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(null);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

+

 		return edge;

 	}

 

 	/**

 	 * @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();

@@ -1167,18 +1318,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(null);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "CommentAnnotatedElement");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

+

 		return edge;

 	}

 

 	/**

 	 * @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();

@@ -1192,18 +1346,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(null);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ConstraintConstrainedElement");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

+

 		return edge;

 	}

 

 	/**

 	 * @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();

@@ -1217,21 +1374,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		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(60);

-		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);

 		dependency_StereotypeLabel_Location.setY(60);

+

 		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "DependencyLink");

 		return edge;

 	}

@@ -1239,7 +1399,8 @@ 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();

@@ -1253,18 +1414,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Dependency");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

+

 		return edge;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createLink_InterfacePortEdge(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createLink_InterfacePortEdge(View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

@@ -1278,18 +1442,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(null);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InterfacePortLink");

-		// 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;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Edge createConnector_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createConnector_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();

@@ -1303,12 +1470,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Connector");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		Node connector_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorAppliedStereotypeEditPart.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 connector_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(ConnectorAppliedStereotypeEditPart.VISUAL_ID));

 		connector_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location connector_StereotypeLabel_Location = (Location) connector_StereotypeLabel.getLayoutConstraint();

 		connector_StereotypeLabel_Location.setX(0);

@@ -1318,6 +1487,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location connector_NameLabel_Location = (Location) connector_NameLabel.getLayoutConstraint();

 		connector_NameLabel_Location.setX(0);

 		connector_NameLabel_Location.setY(-20);

+

 		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Connector");

 		return edge;

 	}

@@ -1347,12 +1517,15 @@ 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());

+

 		if (hasTitle) {

 			TitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();

 			rv.getStyles().add(ts);

@@ -1396,8 +1569,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @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) {

 			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

@@ -1405,6 +1581,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			viewFontStyle.setFontHeight(fontData.getHeight());

 			viewFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

 			viewFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+

 			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(store, fontColorConstant);

 			viewFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());

 		}

@@ -1414,25 +1591,35 @@ 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());

+

 		;

 		if (store.getBoolean(gradientPolicyConstant)) {

-			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(store.getString(gradientColorConstant));

+			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(

+					store.getString(gradientColorConstant));

 			fillStyle.setGradient(gradientPreferenceConverter.getGradientData());

 			fillStyle.setTransparency(gradientPreferenceConverter.getTransparency());

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLVisualTypeProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLVisualTypeProvider.java
index 704fe7ac643..21b21239d6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLVisualTypeProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLVisualTypeProvider.java
@@ -1,64 +1,64 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
-  *
-  * All rights reserved. This program and the accompanying materials
-  * are made available under the terms of the Eclipse Public License v1.0
-  * which accompanies this distribution, and is available at
-  * http://www.eclipse.org/legal/epl-v10.html
-  *
-  * Contributors:
-  *  Christian W. Damus - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.component.providers;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.visualtype.AbstractVisualTypeProvider;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-
-/**
- * @generated
- */
-public class UMLVisualTypeProvider extends AbstractVisualTypeProvider {
-
-	/**
-	 * @generated
-	 */
-	public UMLVisualTypeProvider() {
-		super();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IElementType getElementType(Diagram diagram, String viewType) {
-		IElementType result = null;
-
-		try {
-			result = UMLElementTypes.getElementType(viewType);
-		} catch (NumberFormatException e) {
-			// Not supported by this diagram
-		}
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getNodeType(View parentView, EObject element) {
-		return UMLVisualIDRegistry.getNodeVisualID(parentView, element);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getLinkType(Diagram diagram, EObject element) {
-		return UMLVisualIDRegistry.getLinkWithClassVisualID(element);
-	}
-}
+/**

+ * Copyright (c) 2015 Christian W. Damus and others.

+  *

+  * All rights reserved. This program and the accompanying materials

+  * are made available under the terms of the Eclipse Public License v1.0

+  * which accompanies this distribution, and is available at

+  * http://www.eclipse.org/legal/epl-v10.html

+  *

+  * Contributors:

+  *  Christian W. Damus - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.component.providers;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.service.visualtype.AbstractVisualTypeProvider;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class UMLVisualTypeProvider extends AbstractVisualTypeProvider {

+

+	/**

+	 * @generated

+	 */

+	public UMLVisualTypeProvider() {

+		super();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IElementType getElementType(Diagram diagram, String viewType) {

+		IElementType result = null;

+

+		try {

+			result = UMLElementTypes.getElementType(viewType);

+		} catch (NumberFormatException e) {

+			// Not supported by this diagram

+		}

+

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getNodeType(View parentView, EObject element) {

+		return UMLVisualIDRegistry.getNodeVisualID(parentView, element);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getLinkType(Diagram diagram, EObject element) {

+		return UMLVisualIDRegistry.getLinkWithClassVisualID(element);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/sheet/UMLPropertySection.java
index b8ff2fa1d59..ab2b653fc6f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/sheet/UMLPropertySection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/sheet/UMLPropertySection.java
@@ -1,32 +1,32 @@
-/**
- * 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.component.sheet;
-
-import org.eclipse.gmf.tooling.runtime.sheet.DefaultPropertySection;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-
-/**
- * @generated
- */
-public class UMLPropertySection extends DefaultPropertySection implements IPropertySourceProvider {
-
-	/**
-	 * Modify/unwrap selection.
-	 *
-	 * @generated
-	 */
-	@Override
-	protected Object transformSelection(Object selected) {
-		selected = /* super. */transformSelectionToDomain(selected);
-		return selected;
-	}
-}
+/**

+ * 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.component.sheet;

+

+import org.eclipse.gmf.tooling.runtime.sheet.DefaultPropertySection;

+import org.eclipse.ui.views.properties.IPropertySourceProvider;

+

+/**

+ * @generated

+ */

+public class UMLPropertySection extends DefaultPropertySection implements IPropertySourceProvider {

+

+	/**

+	 * Modify/unwrap selection.

+	 *

+	 * @generated

+	 */

+	@Override

+	protected Object transformSelection(Object selected) {

+		selected = /*super.*/transformSelectionToDomain(selected);

+		return selected;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/sheet/UMLSheetLabelProvider.java
index c406b47ec62..1a41154b038 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/sheet/UMLSheetLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/sheet/UMLSheetLabelProvider.java
@@ -1,86 +1,86 @@
-/**
- * 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.component.sheet;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.BaseLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @generated
- */
-public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelProvider {
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getText(Object element) {
-		element = unwrap(element);
-		IElementType etype = getElementType(getView(element));
-		return etype == null ? "" : etype.getDisplayName();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public Image getImage(Object element) {
-		IElementType etype = getElementType(getView(unwrap(element)));
-		return etype == null ? null : UMLElementTypes.getImage(etype);
-	}
-
-	/**
-	 * @generated
-	 */
-	private Object unwrap(Object element) {
-		if (element instanceof IStructuredSelection) {
-			return ((IStructuredSelection) element).getFirstElement();
-		}
-		return element;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getView(Object element) {
-		if (element instanceof View) {
-			return (View) element;
-		}
-		if (element instanceof IAdaptable) {
-			return (View) ((IAdaptable) element).getAdapter(View.class);
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IElementType getElementType(View view) {
-		// For intermediate views climb up the containment hierarchy to find the one associated with an element type.
-		while (view != null) {
-			String vid = UMLVisualIDRegistry.getVisualID(view);
-			IElementType etype = UMLElementTypes.getElementType(vid);
-			if (etype != null) {
-				return etype;
-			}
-			view = view.eContainer() instanceof View ? (View) view.eContainer() : null;
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.component.sheet;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.viewers.BaseLabelProvider;

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.graphics.Image;

+

+/**

+ * @generated

+ */

+public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelProvider {

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getText(Object element) {

+		element = unwrap(element);

+		IElementType etype = getElementType(getView(element));

+		return etype == null ? "" : etype.getDisplayName();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public Image getImage(Object element) {

+		IElementType etype = getElementType(getView(unwrap(element)));

+		return etype == null ? null : UMLElementTypes.getImage(etype);

+	}

+

+	/**

+	 * @generated

+	 */

+	private Object unwrap(Object element) {

+		if (element instanceof IStructuredSelection) {

+			return ((IStructuredSelection) element).getFirstElement();

+		}

+		return element;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getView(Object element) {

+		if (element instanceof View) {

+			return (View) element;

+		}

+		if (element instanceof IAdaptable) {

+			return (View) ((IAdaptable) element).getAdapter(View.class);

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IElementType getElementType(View view) {

+		// For intermediate views climb up the containment hierarchy to find the one associated with an element type.

+		while (view != null) {

+			String vid = UMLVisualIDRegistry.getVisualID(view);

+			IElementType etype = UMLElementTypes.getElementType(vid);

+			if (etype != null) {

+				return etype;

+			}

+			view = view.eContainer() instanceof View ? (View) view.eContainer() : null;

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/parts/ResizablePortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/parts/ResizablePortEditPart.java
index 4180177d6a9..273ab4443a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/parts/ResizablePortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/parts/ResizablePortEditPart.java
@@ -15,7 +15,6 @@
 package org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts;
 
 import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
@@ -98,7 +97,7 @@ public class ResizablePortEditPart extends PortEditPart {
 	@Override
 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
 		if (borderItemEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure());
 			borderItemContainer.add(((PortEditPart) borderItemEditPart).getFigure(), locator);
 		} else {
 			super.addBorderItem(borderItemContainer, borderItemEditPart);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/BehaviorPortLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/BehaviorPortLocator.java
index dcd607119c8..fc502328661 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/BehaviorPortLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/BehaviorPortLocator.java
@@ -23,6 +23,18 @@ import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
  */

 public class BehaviorPortLocator extends PortPositionLocator {

 

+	

+	/**

+	 * Constructor.

+	 *

+	 * @param parentFigure

+	 */

+	public BehaviorPortLocator(IFigure parentFigure) {

+		super(parentFigure);

+	}

+	

+	

+	@Deprecated

 	public BehaviorPortLocator(IFigure parentFigure, int preferredSide) {

 		super(parentFigure, preferredSide);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/CustomPortPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/CustomPortPositionLocator.java
index 7e24964391f..8e08432d6e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/CustomPortPositionLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/CustomPortPositionLocator.java
@@ -34,8 +34,12 @@ public class CustomPortPositionLocator extends PortPositionLocator {
 
 	protected RoundedBorderNamedElementEditPart portEditPart = null;
 	
-	
+	public CustomPortPositionLocator(IFigure parentFigure, RoundedBorderNamedElementEditPart childEditPart) {
+		super(parentFigure);
+		portEditPart = childEditPart;
+	}	
 
+	@Deprecated
 	public CustomPortPositionLocator(IFigure parentFigure, RoundedBorderNamedElementEditPart childEditPart,
 			int none) {
 		super(parentFigure, none);
@@ -60,14 +64,10 @@ public class CustomPortPositionLocator extends PortPositionLocator {
 		
 		// Calculate Max position around the graphical parent (1/2 size or the port around
 		// the graphical parent bounds.
-//		int xMin = parentRec.x - thisRec.width + borderItemOffset;
 		int xMin = parentRec.x - thisRec.width/2;		
-//		int xMax = parentRec.x - borderItemOffset + parentRec.width;
 		int xMax = parentRec.x + parentRec.width - thisRec.width/2;
 		
-//		int yMin = parentRec.y - thisRec.height + borderItemOffset;
 		int yMin = parentRec.y - thisRec.height/2;		
-//		int yMax = parentRec.y - borderItemOffset + parentRec.height;
 		int yMax = parentRec.y + parentRec.height - thisRec.height/2;
 
 		// Modify Port location if MAX X or Y are exceeded
@@ -157,18 +157,12 @@ public class CustomPortPositionLocator extends PortPositionLocator {
 
 		int x = constraint.x;
 		int y = constraint.y;
-//		int h = thisRec.height;
-//		int w = thisRec.width;
 		
 		Rectangle p = parentFigure.getBounds();
 		
 		int xMin = p.x - thisRec.width/2;		
-//		int xMax = parentRec.x - borderItemOffset + parentRec.width;
 		int xMax = p.x + p.width - thisRec.width/2;
-		
-//		int yMin = parentRec.y - thisRec.height + borderItemOffset;
 		int yMin = p.y - thisRec.height/2;		
-//		int yMax = parentRec.y - borderItemOffset + parentRec.height;
 		int yMax = p.y + p.height - thisRec.height/2;
 		
 		if(x == xMin && y == yMin)
@@ -187,38 +181,6 @@ public class CustomPortPositionLocator extends PortPositionLocator {
 			position = PositionConstants.WEST;
 		else 
 			position = PositionConstants.EAST;
-		
-		
-//		//NORTH EAST
-//		if(y == borderItemOffset -h && x == p.width - borderItemOffset)
-//			position = PositionConstants.NORTH_EAST;
-//
-//		//NORTH WEST
-//		else if(x == -(w - borderItemOffset) && y == -(h - borderItemOffset)) 
-//			position = PositionConstants.NORTH_WEST;
-//		
-//		//SOUTH WEST
-//		else if(x == -(w - borderItemOffset) && y == p.height - borderItemOffset)
-//			position = PositionConstants.SOUTH_WEST;
-//		
-//		//SOUTH EAST
-//		else if(x == p.width - borderItemOffset && y == p.height - borderItemOffset)
-//			position = PositionConstants.SOUTH_EAST;		
-//		
-//		//EAST
-//		else if(x >= p.width - borderItemOffset )
-//			position = PositionConstants.EAST;
-//		
-//		//WEST
-//		else if(x <= -(w - borderItemOffset))
-//			position = PositionConstants.WEST;
-//		
-//		//NORTH
-//		else if(y <= -(h-borderItemOffset))
-//			position = PositionConstants.NORTH;
-//		//SOUTH
-//		else if(y >= p.height - borderItemOffset)
-//			position = PositionConstants.SOUTH;
 		return position;
 	}
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/ExternalPortPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/ExternalPortPositionLocator.java
index e84af8cca29..f537ae84672 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/ExternalPortPositionLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/ExternalPortPositionLocator.java
@@ -19,6 +19,12 @@ import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
 
 public class ExternalPortPositionLocator extends PortPositionLocator {
 
+	
+	public ExternalPortPositionLocator(IFigure parentFigure) {
+		super(parentFigure);
+	}	
+	
+	@Deprecated
 	public ExternalPortPositionLocator(IFigure parentFigure, int preferredSide) {
 		super(parentFigure, preferredSide);
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/InternalPortPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/InternalPortPositionLocator.java
index f0ba1b52090..8b3b6fb8e39 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/InternalPortPositionLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/InternalPortPositionLocator.java
@@ -20,6 +20,11 @@ import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
 

 public class InternalPortPositionLocator extends PortPositionLocator {

 

+	public InternalPortPositionLocator(IFigure parentFigure) {

+		super(parentFigure);

+	}	

+	

+	@Deprecated

 	public InternalPortPositionLocator(IFigure parentFigure, int preferredSide) {

 		super(parentFigure, preferredSide);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen
index 8e71d9ad754..2b844428520 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen
@@ -163,10 +163,6 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

-        <behaviour

-            xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy.BEHAVIOR_PORT"

             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy"/>

         <behaviour

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UMLBaseEditHelper.java
index ea03bef14d9..555d8ff26f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UMLBaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UMLBaseEditHelper.java
@@ -18,8 +18,4 @@ import org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase;
  */

 public class UMLBaseEditHelper extends GeneratedEditHelperBase {

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
index 3f2b872ca5b..29f73354b31 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		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,8 +295,7 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		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());

 	}

 

@@ -318,12 +318,16 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 					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(), AbstractionAppliedStereotypeEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																AbstractionAppliedStereotypeEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -447,13 +451,18 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 					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;

 				}

@@ -465,7 +474,8 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +501,10 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 				@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();

@@ -544,8 +555,7 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +572,7 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +582,10 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +689,14 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +709,10 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	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;

 		}

@@ -722,11 +733,13 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 				@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 {

@@ -740,7 +753,6 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +765,10 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java
index 06aaea48e1d..c3c46b96492 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
 /**

  * @generated

  */

-public class AbstractionEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class AbstractionEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,12 +53,11 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof AbstractionNameEditPart) {

-			((AbstractionNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+			((AbstractionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof AbstractionAppliedStereotypeEditPart) {

-			((AbstractionAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((AbstractionAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
index b57279d6125..2216fa3b4a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class AbstractionNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionNameEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 		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,8 +295,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 		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());

 	}

 

@@ -318,12 +318,13 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 					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(), AbstractionNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), AbstractionNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -447,13 +448,18 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 					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;

 				}

@@ -465,7 +471,8 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +498,10 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 				@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();

@@ -544,8 +552,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +569,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +579,10 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -691,11 +694,14 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 */

 	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);

 			}

 		}

 	}

@@ -708,8 +714,10 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	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;

 		}

@@ -730,11 +738,13 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 				@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 {

@@ -748,7 +758,6 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -761,10 +770,10 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
index a2f694575be..af2771f2438 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class ActivityCompositeCompartmentEditPart

-		extends LinkLFShapeCompartmentEditPart {

+public class ActivityCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class ActivityCompositeCompartmentEditPart
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class ActivityCompositeCompartmentEditPart
 		return Messages.ActivityCompositeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class ActivityCompositeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class ActivityCompositeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
index be1e232ab44..b9e94776dd2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class ActivityCompositeCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class ActivityCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class ActivityCompositeCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class ActivityCompositeCompartmentEditPartCN
 		return Messages.ActivityCompositeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class ActivityCompositeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class ActivityCompositeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
index 6e9abc3dacd..d833e4bcd55 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
@@ -104,11 +104,15 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());

@@ -163,7 +167,6 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -177,8 +180,7 @@ public class ActivityCompositeEditPart 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;

 				}

@@ -188,7 +190,6 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -214,34 +215,27 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ActivityCompositeCompartmentEditPart) {

 			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(((ActivityCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -321,7 +315,6 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -371,7 +364,6 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -395,8 +387,4 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityCompositeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
index 04be9b6c329..e5400f6ee61 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
@@ -103,11 +103,15 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -161,7 +165,6 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -175,8 +178,7 @@ public class ActivityCompositeEditPartCN 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;

 				}

@@ -186,7 +188,6 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -212,34 +213,27 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ActivityCompositeCompartmentEditPartCN) {

 			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(((ActivityCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -319,7 +313,6 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -369,7 +362,6 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -393,8 +385,4 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityCompositeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPart.java
index 555c5fcd248..9be302d37c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ActivityCompositeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ActivityCompositeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ActivityCompositeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ActivityCompositeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class ActivityCompositeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class ActivityCompositeFloatingLabelEditPart extends
 					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(), ActivityCompositeFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ActivityCompositeFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class ActivityCompositeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class ActivityCompositeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class ActivityCompositeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class ActivityCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class ActivityCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class ActivityCompositeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class ActivityCompositeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class ActivityCompositeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class ActivityCompositeFloatingLabelEditPart extends
 				@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 +777,6 @@ public class ActivityCompositeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class ActivityCompositeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPartCN.java
index d4c5a365b07..e28124a2f9b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ActivityCompositeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 					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(), ActivityCompositeFloatingLabelEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														ActivityCompositeFloatingLabelEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +466,18 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +489,8 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +516,10 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +570,7 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +587,7 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +597,10 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +712,14 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +732,10 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +756,13 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 				@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 +776,6 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +788,10 @@ public class ActivityCompositeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java
index cd2419c41da..b349abda454 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 		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) {

@@ -290,8 +288,7 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ActivityCompositeNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														ActivityCompositeNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +442,18 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 					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;

 				}

@@ -461,7 +465,8 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +492,10 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 				@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();

@@ -546,8 +552,7 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +569,7 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +579,10 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +694,14 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +714,10 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	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;

 		}

@@ -732,11 +738,13 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 				@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 {

@@ -750,7 +758,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +774,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +787,10 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +807,8 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 				}

 			}

 		}

-		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);

@@ -815,13 +822,11 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +852,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java
index 448692744a1..532ef76af66 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ActivityCompositeNameEditPartCN 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) {

@@ -290,8 +288,7 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ActivityCompositeNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														ActivityCompositeNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +442,18 @@ public class ActivityCompositeNameEditPartCN 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;

 				}

@@ -461,7 +465,8 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +492,10 @@ public class ActivityCompositeNameEditPartCN 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();

@@ -546,8 +552,7 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +569,7 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +579,10 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +694,14 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +714,10 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	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;

 		}

@@ -732,11 +738,13 @@ public class ActivityCompositeNameEditPartCN 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 {

@@ -750,7 +758,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +774,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +787,10 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +807,8 @@ public class ActivityCompositeNameEditPartCN 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);

@@ -815,13 +822,11 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +852,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
index c09409afbba..39c3c9f6969 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
@@ -85,7 +85,8 @@ public class ActorEditPart extends NodeEditPart {
 

 		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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -135,9 +136,6 @@ public class ActorEditPart extends NodeEditPart {
 		return lep;

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -163,7 +161,6 @@ public class ActorEditPart extends NodeEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -227,7 +224,6 @@ public class ActorEditPart extends NodeEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -277,7 +273,6 @@ public class ActorEditPart extends NodeEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -301,8 +296,4 @@ public class ActorEditPart extends NodeEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActorNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
index 3de277bd4b2..27281e26e32 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
@@ -85,7 +85,8 @@ public class ActorEditPartCN extends NodeEditPart {
 

 		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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -135,9 +136,6 @@ public class ActorEditPartCN extends NodeEditPart {
 		return lep;

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -163,7 +161,6 @@ public class ActorEditPartCN extends NodeEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -227,7 +224,6 @@ public class ActorEditPartCN extends NodeEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -277,7 +273,6 @@ public class ActorEditPartCN extends NodeEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -301,8 +296,4 @@ public class ActorEditPartCN extends NodeEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActorNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPart.java
index 7e268fc2906..71e69cb7d5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ActorFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class ActorFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ActorFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActorFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActorFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ActorFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ActorFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class ActorFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,13 @@ public class ActorFloatingLabelEditPart extends
 					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(), ActorFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ActorFloatingLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +464,18 @@ public class ActorFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +487,8 @@ public class ActorFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +514,10 @@ public class ActorFloatingLabelEditPart extends
 				@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();

@@ -562,8 +568,7 @@ public class ActorFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +585,7 @@ public class ActorFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +595,10 @@ public class ActorFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +710,14 @@ public class ActorFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +730,10 @@ public class ActorFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +754,13 @@ public class ActorFloatingLabelEditPart extends
 				@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 +774,6 @@ public class ActorFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +786,10 @@ public class ActorFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPartCN.java
index a5465a83b7a..200241828b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ActorFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ActorFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActorFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActorFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ActorFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ActorFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class ActorFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class ActorFloatingLabelEditPartCN extends
 					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(), ActorFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														ActorFloatingLabelEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +465,18 @@ public class ActorFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class ActorFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class ActorFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +569,7 @@ public class ActorFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class ActorFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class ActorFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class ActorFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class ActorFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class ActorFloatingLabelEditPartCN extends
 				@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 +775,6 @@ public class ActorFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class ActorFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java
index ebf141dd262..dbe37a68f27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ActorNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 		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) {

@@ -290,8 +288,7 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ActorNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(), ActorNameEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +442,18 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 					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;

 				}

@@ -461,7 +465,8 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +492,10 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 				@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();

@@ -546,8 +552,7 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +569,7 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +579,10 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +694,14 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +714,10 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	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;

 		}

@@ -732,11 +738,13 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 				@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 {

@@ -750,7 +758,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +774,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +787,10 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +807,8 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 				}

 			}

 		}

-		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);

@@ -815,13 +822,11 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +852,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java
index 3af83bb027c..17d98063c1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ActorNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 		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) {

@@ -290,8 +288,7 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ActorNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ActorNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 					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;

 				}

@@ -461,7 +464,8 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 				@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();

@@ -546,8 +551,7 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	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;

 		}

@@ -732,11 +737,13 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 				@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 {

@@ -750,7 +757,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
index d43865bbe02..65d9b059db0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
@@ -89,7 +89,8 @@ public class AnyReceiveEventEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class AnyReceiveEventEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(AnyReceiveEventNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventFloatingLabelEditPart.java
index 8b24fa82e4f..d60daeda70d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class AnyReceiveEventFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AnyReceiveEventFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.AnyReceiveEventFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 					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(), AnyReceiveEventFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																AnyReceiveEventFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 				@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 +777,6 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class AnyReceiveEventFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java
index 06476285b6c..b77ec101d08 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 		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) {

@@ -290,8 +288,7 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AnyReceiveEventNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), AnyReceiveEventNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 					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;

 				}

@@ -461,7 +464,8 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 				@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();

@@ -546,8 +551,7 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	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;

 		}

@@ -732,11 +737,13 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 				@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 {

@@ -750,7 +757,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
index 212933cc4d8..dc4346047dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
@@ -85,7 +85,8 @@ public class ArtifactEditPart extends NodeEditPart {
 

 		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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -135,9 +136,6 @@ public class ArtifactEditPart extends NodeEditPart {
 		return lep;

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -163,7 +161,6 @@ public class ArtifactEditPart extends NodeEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -227,7 +224,6 @@ public class ArtifactEditPart extends NodeEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -277,7 +273,6 @@ public class ArtifactEditPart extends NodeEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -301,8 +296,4 @@ public class ArtifactEditPart extends NodeEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
index 27729bc52e0..910a5dd84af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
@@ -85,7 +85,8 @@ public class ArtifactEditPartCN extends NodeEditPart {
 

 		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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -135,9 +136,6 @@ public class ArtifactEditPartCN extends NodeEditPart {
 		return lep;

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -163,7 +161,6 @@ public class ArtifactEditPartCN extends NodeEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -227,7 +224,6 @@ public class ArtifactEditPartCN extends NodeEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -277,7 +273,6 @@ public class ArtifactEditPartCN extends NodeEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -301,8 +296,4 @@ public class ArtifactEditPartCN extends NodeEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPart.java
index 7832a8c3840..7c56b317480 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ArtifactFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ArtifactFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ArtifactFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ArtifactFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ArtifactFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ArtifactFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class ArtifactFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class ArtifactFloatingLabelEditPart extends
 					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();

@@ -465,13 +465,18 @@ public class ArtifactFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class ArtifactFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class ArtifactFloatingLabelEditPart extends
 				@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();

@@ -562,8 +569,7 @@ public class ArtifactFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class ArtifactFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class ArtifactFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class ArtifactFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class ArtifactFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class ArtifactFloatingLabelEditPart extends
 				@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 +775,6 @@ public class ArtifactFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class ArtifactFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPartCN.java
index c44aedaed53..e6ffb58365e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ArtifactFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ArtifactFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ArtifactFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ArtifactFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ArtifactFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ArtifactFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class ArtifactFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class ArtifactFloatingLabelEditPartCN extends
 					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();

@@ -465,13 +465,18 @@ public class ArtifactFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class ArtifactFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class ArtifactFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +569,7 @@ public class ArtifactFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class ArtifactFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class ArtifactFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class ArtifactFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class ArtifactFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class ArtifactFloatingLabelEditPartCN extends
 				@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 +775,6 @@ public class ArtifactFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class ArtifactFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java
index 957ff16f882..f946d3ed4bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ArtifactNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 		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) {

@@ -290,8 +288,7 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						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();

@@ -443,13 +441,18 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 					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;

 				}

@@ -461,7 +464,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 				@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();

@@ -546,8 +551,7 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	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;

 		}

@@ -732,11 +737,13 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 				@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 {

@@ -750,7 +757,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java
index 3e7e9fe6914..a7cfe0ddf5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 		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) {

@@ -290,8 +288,7 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						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();

@@ -443,13 +441,18 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 					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;

 				}

@@ -461,7 +464,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 				@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();

@@ -546,8 +551,7 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	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;

 		}

@@ -732,11 +737,13 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 				@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 {

@@ -750,7 +757,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
index 699534356ca..ed359d7988a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
@@ -136,7 +136,6 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -150,8 +149,7 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 		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;

 				}

@@ -161,7 +159,6 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -178,7 +175,6 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 		return (RoundedCompartmentFigure) primaryShape;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -199,7 +195,6 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -244,7 +239,6 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -268,8 +262,4 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(BehaviorPortFloatingLabelEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortFloatingLabelEditPart.java
index 60d44726697..5062025e357 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class BehaviorPortFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class BehaviorPortFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.BehaviorPortFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.BehaviorPortFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class BehaviorPortFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class BehaviorPortFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class BehaviorPortFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class BehaviorPortFloatingLabelEditPart extends
 					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(), BehaviorPortFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																BehaviorPortFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class BehaviorPortFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class BehaviorPortFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class BehaviorPortFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class BehaviorPortFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class BehaviorPortFloatingLabelEditPart extends
 				@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 +777,6 @@ public class BehaviorPortFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class BehaviorPortFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortLinkEditPart.java
index fc87d8474fb..7e29ca2bf85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortLinkEditPart.java
@@ -25,8 +25,7 @@ import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoDeleteFr
 /**

  * @generated

  */

-public class BehaviorPortLinkEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart {

+public class BehaviorPortLinkEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -51,10 +50,6 @@ public class BehaviorPortLinkEditPart extends ConnectionEditPart
 		installEditPolicy(EditPolicy.COMPONENT_ROLE, new NoDeleteFromDiagramEditPolicy());

 	}

 

-

-

-

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
index 3e9e89e4dd0..41b5c04d0f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
@@ -89,7 +89,8 @@ public class CallEventEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class CallEventEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CallEventNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventFloatingLabelEditPart.java
index fc524244eed..52f79718a91 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CallEventFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class CallEventFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CallEventFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.CallEventFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class CallEventFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class CallEventFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class CallEventFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class CallEventFloatingLabelEditPart extends
 					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(), CallEventFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														CallEventFloatingLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +465,18 @@ public class CallEventFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class CallEventFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class CallEventFloatingLabelEditPart extends
 				@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();

@@ -562,8 +569,7 @@ public class CallEventFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class CallEventFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class CallEventFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class CallEventFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class CallEventFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class CallEventFloatingLabelEditPart extends
 				@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 +775,6 @@ public class CallEventFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class CallEventFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java
index ca62b9d50f1..752f700def2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class CallEventNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 		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) {

@@ -290,8 +288,7 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), CallEventNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), CallEventNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 					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;

 				}

@@ -461,7 +464,8 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 				@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();

@@ -546,8 +551,7 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	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;

 		}

@@ -732,11 +737,13 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 				@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 {

@@ -750,7 +757,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
index 0decc9965bf..3356fff99c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
@@ -89,7 +89,8 @@ public class ChangeEventEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class ChangeEventEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ChangeEventNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventFloatingLabelEditPart.java
index 52f01aa49c9..0ba781d58cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ChangeEventFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ChangeEventFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ChangeEventFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ChangeEventFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ChangeEventFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ChangeEventFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class ChangeEventFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class ChangeEventFloatingLabelEditPart extends
 					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(), ChangeEventFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ChangeEventFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class ChangeEventFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class ChangeEventFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class ChangeEventFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class ChangeEventFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class ChangeEventFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class ChangeEventFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class ChangeEventFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class ChangeEventFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class ChangeEventFloatingLabelEditPart extends
 				@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 +777,6 @@ public class ChangeEventFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class ChangeEventFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java
index bd692eb5c44..680a62fe756 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		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) {

@@ -290,8 +288,7 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ChangeEventNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ChangeEventNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 					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;

 				}

@@ -461,7 +464,8 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 				@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();

@@ -546,8 +551,7 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	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;

 		}

@@ -732,11 +737,13 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 				@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 {

@@ -750,7 +757,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
index 2760887ab31..e9246e3d3cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class ClassCompositeCompartmentEditPart

-		extends LinkLFShapeCompartmentEditPart {

+public class ClassCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class ClassCompositeCompartmentEditPart
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class ClassCompositeCompartmentEditPart
 		return Messages.ClassCompositeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class ClassCompositeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class ClassCompositeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
index e3b8d83f6f3..7065b288577 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class ClassCompositeCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class ClassCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class ClassCompositeCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class ClassCompositeCompartmentEditPartCN
 		return Messages.ClassCompositeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class ClassCompositeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class ClassCompositeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
index 3e1dae7da11..21c86dccace 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
@@ -104,11 +104,15 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());

@@ -162,7 +166,6 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -176,8 +179,7 @@ public class ClassCompositeEditPart 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;

 				}

@@ -187,7 +189,6 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -213,24 +214,20 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ClassCompositeCompartmentEditPart) {

 			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(((ClassCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -306,7 +303,6 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -356,7 +352,6 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -380,8 +375,4 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassCompositeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
index 530bd9313dc..61d0a4afb86 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
@@ -103,11 +103,15 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -160,7 +164,6 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -174,8 +177,7 @@ public class ClassCompositeEditPartCN 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;

 				}

@@ -185,7 +187,6 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -211,24 +212,20 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ClassCompositeCompartmentEditPartCN) {

 			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(((ClassCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -304,7 +301,6 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -354,7 +350,6 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -378,8 +373,4 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassCompositeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPart.java
index 2670d6d7084..f3df1229aa8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ClassCompositeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ClassCompositeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ClassCompositeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ClassCompositeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class ClassCompositeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class ClassCompositeFloatingLabelEditPart extends
 					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(), ClassCompositeFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ClassCompositeFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class ClassCompositeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class ClassCompositeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class ClassCompositeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class ClassCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class ClassCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class ClassCompositeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class ClassCompositeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class ClassCompositeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class ClassCompositeFloatingLabelEditPart extends
 				@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 +777,6 @@ public class ClassCompositeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class ClassCompositeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPartCN.java
index 2206d2a4bfd..c3370100ad0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ClassCompositeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 					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(), ClassCompositeFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ClassCompositeFloatingLabelEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class ClassCompositeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java
index 0aaf9c49af4..e1592e9a1bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 		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) {

@@ -290,8 +288,7 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ClassCompositeNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ClassCompositeNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 					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;

 				}

@@ -461,7 +464,8 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 				@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();

@@ -546,8 +551,7 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	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;

 		}

@@ -732,11 +737,13 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 				@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 {

@@ -750,7 +757,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java
index fbd9617ead1..f3eacadf888 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 		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) {

@@ -290,8 +288,7 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ClassCompositeNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														ClassCompositeNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +442,18 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 					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;

 				}

@@ -461,7 +465,8 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +492,10 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 				@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();

@@ -546,8 +552,7 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +569,7 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +579,10 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +694,14 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +714,10 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	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;

 		}

@@ -732,11 +738,13 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 				@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 {

@@ -750,7 +758,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +774,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +787,10 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +807,8 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 				}

 			}

 		}

-		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);

@@ -815,13 +822,11 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +852,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
index 44983f5a038..862d3baf228 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
@@ -38,8 +38,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class CollaborationCompositeCompartmentEditPart

-		extends LinkLFShapeCompartmentEditPart {

+public class CollaborationCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -53,7 +52,6 @@ public class CollaborationCompositeCompartmentEditPart
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -61,7 +59,6 @@ public class CollaborationCompositeCompartmentEditPart
 		return Messages.CollaborationCompositeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -78,9 +75,6 @@ public class CollaborationCompositeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -122,10 +116,7 @@ public class CollaborationCompositeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
index aecdad195b7..08e79e2c1cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
@@ -38,8 +38,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class CollaborationCompositeCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class CollaborationCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -53,7 +52,6 @@ public class CollaborationCompositeCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -61,7 +59,6 @@ public class CollaborationCompositeCompartmentEditPartCN
 		return Messages.CollaborationCompositeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -78,9 +75,6 @@ public class CollaborationCompositeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -122,10 +116,7 @@ public class CollaborationCompositeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
index f45f729651f..14898daa019 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
@@ -92,10 +92,13 @@ public class CollaborationCompositeEditPart 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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

-		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(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -145,7 +148,6 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -159,8 +161,7 @@ public class CollaborationCompositeEditPart 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;

 				}

@@ -170,7 +171,6 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -196,10 +196,9 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof CollaborationCompositeCompartmentEditPart) {

 			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(((CollaborationCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

@@ -275,7 +274,6 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -325,7 +323,6 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -349,8 +346,4 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
index 881cfe1d501..b400c0e1960 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
@@ -92,10 +92,13 @@ public class CollaborationCompositeEditPartCN 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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

-		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(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -145,7 +148,6 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -159,8 +161,7 @@ public class CollaborationCompositeEditPartCN 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;

 				}

@@ -170,7 +171,6 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -196,10 +196,9 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 			return true;

 		}

 

-

 		if (childEditPart instanceof CollaborationCompositeCompartmentEditPartCN) {

 			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(((CollaborationCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

@@ -275,7 +274,6 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -325,7 +323,6 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -349,8 +346,4 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPart.java
index b66ec92883b..b2eebeb8b09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CollaborationCompositeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 					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(), CollaborationCompositeFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														CollaborationCompositeFloatingLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +466,18 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +489,8 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +516,10 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +570,7 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +587,7 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +597,10 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +712,14 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +732,10 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +756,13 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 				@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 +776,6 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +788,10 @@ public class CollaborationCompositeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPartCN.java
index 7c22b3e536c..dc9a1ca9328 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CollaborationCompositeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 					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(), CollaborationCompositeFloatingLabelEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														CollaborationCompositeFloatingLabelEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +466,18 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +489,8 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +516,10 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +570,7 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +587,7 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +597,10 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +712,14 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +732,10 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +756,13 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 				@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 +776,6 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +788,10 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java
index 05f7e9a7895..0236ab15582 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class CollaborationCompositeNameEditPart 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) {

@@ -290,8 +288,7 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), CollaborationCompositeNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																CollaborationCompositeNameEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +444,18 @@ public class CollaborationCompositeNameEditPart 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;

 				}

@@ -461,7 +467,8 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class CollaborationCompositeNameEditPart 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();

@@ -546,8 +554,7 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	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;

 		}

@@ -732,11 +740,13 @@ public class CollaborationCompositeNameEditPart 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 {

@@ -750,7 +760,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 				}

 			}

 		}

-		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);

@@ -815,13 +824,11 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java
index b9199ca3499..11907cb2d16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 		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) {

@@ -290,8 +288,7 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), CollaborationCompositeNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																CollaborationCompositeNameEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +444,18 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 					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;

 				}

@@ -461,7 +467,8 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 				@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();

@@ -546,8 +554,7 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	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;

 		}

@@ -732,11 +740,13 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 				@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 {

@@ -750,7 +760,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 				}

 			}

 		}

-		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);

@@ -815,13 +824,11 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
index bd05b473221..c6b6560c2b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
@@ -91,7 +91,8 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationRoleItemSemanticEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -141,7 +142,6 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -155,8 +155,7 @@ public class CollaborationRoleEditPartCN 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;

 				}

@@ -166,7 +165,6 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -192,7 +190,6 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -256,7 +253,6 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -306,7 +302,6 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -330,8 +325,4 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationRoleNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleFloatingLabelEditPartCN.java
index 7564bcae633..4cb0f42d694 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CollaborationRoleFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationRoleFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationRoleFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 					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(), CollaborationRoleFloatingLabelEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														CollaborationRoleFloatingLabelEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -378,7 +379,8 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.ConnectableElement_CollaborationRoleShape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.ConnectableElement_CollaborationRoleShape, getParserElement(),

+					this, VISUAL_ID);

 		}

 		return parser;

 	}

@@ -465,13 +467,18 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class CollaborationRoleFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java
index 71d5e7aa6fc..41f8ce790b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class CollaborationRoleNameEditPartCN 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) {

@@ -290,8 +288,7 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), CollaborationRoleNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														CollaborationRoleNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +355,8 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.ConnectableElement_CollaborationRoleShape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.ConnectableElement_CollaborationRoleShape, getParserElement(),

+					this, VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +443,18 @@ public class CollaborationRoleNameEditPartCN 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;

 				}

@@ -461,7 +466,8 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +493,10 @@ public class CollaborationRoleNameEditPartCN 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();

@@ -546,8 +553,7 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +570,7 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +580,10 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -685,11 +687,14 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -702,8 +707,10 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	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;

 		}

@@ -724,11 +731,13 @@ public class CollaborationRoleNameEditPartCN 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 {

@@ -742,7 +751,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -759,7 +767,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -773,10 +780,10 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -793,7 +800,8 @@ public class CollaborationRoleNameEditPartCN 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);

@@ -807,13 +815,11 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -839,7 +845,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
index 55bff038159..acf00b06bec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
@@ -90,7 +90,8 @@ public class CollaborationUseEditPartCN 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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -141,7 +142,6 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -155,8 +155,7 @@ public class CollaborationUseEditPartCN 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;

 				}

@@ -166,7 +165,6 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -192,7 +190,6 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -256,7 +253,6 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -306,7 +302,6 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -330,8 +325,4 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationUseNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseFloatingLabelEditPartCN.java
index 01d801b0458..3d749ba82f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CollaborationUseFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationUseFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationUseFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 					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(), CollaborationUseFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																CollaborationUseFloatingLabelEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class CollaborationUseFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java
index 6bb8d6e80fc..a52cb28f822 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java
@@ -84,7 +84,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -125,7 +126,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -141,10 +141,10 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new CollaborationUseLabelEditPolicy());

+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY,

+				new CollaborationUseLabelEditPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -260,8 +260,7 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 		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) {

@@ -292,8 +291,7 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 		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());

 	}

 

@@ -316,12 +314,14 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), CollaborationUseNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														CollaborationUseNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -445,13 +445,18 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 					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;

 				}

@@ -463,7 +468,8 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -489,9 +495,10 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 				@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();

@@ -548,8 +555,7 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -566,8 +572,7 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -577,13 +582,10 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -695,11 +697,14 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	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);

 			}

 		}

 	}

@@ -712,8 +717,10 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	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;

 		}

@@ -734,11 +741,13 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 				@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 {

@@ -752,7 +761,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -769,7 +777,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -783,10 +790,10 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -803,7 +810,8 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 				}

 			}

 		}

-		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);

@@ -817,13 +825,11 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -849,7 +855,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentAnnotatedElementEditPart.java
index a9a6d705aef..61731870348 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentAnnotatedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentAnnotatedElementEditPart.java
@@ -22,8 +22,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure
 /**

  * @generated

  */

-public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,10 +44,6 @@ public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 	}

 

-

-

-

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java
index 44d9ca00864..e7f739591dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java
@@ -79,7 +79,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class CommentBodyEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -120,7 +121,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -138,7 +138,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -244,8 +243,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 		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,8 +274,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 		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());

 	}

 

@@ -300,12 +297,13 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						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();

@@ -429,13 +427,18 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 					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;

 				}

@@ -447,7 +450,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -473,9 +477,10 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 				@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();

@@ -532,8 +537,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -550,8 +554,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -561,13 +564,10 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -679,11 +679,14 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	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);

 			}

 		}

 	}

@@ -696,8 +699,10 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	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;

 		}

@@ -718,11 +723,13 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 				@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 {

@@ -736,7 +743,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,7 +759,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,10 +772,10 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -798,13 +803,11 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -830,7 +833,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java
index a36f357dfcd..59c38163913 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java
@@ -79,7 +79,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -120,7 +121,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -138,7 +138,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -244,8 +243,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 		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,8 +274,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 		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());

 	}

 

@@ -300,12 +297,13 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						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();

@@ -429,13 +427,18 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 					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;

 				}

@@ -447,7 +450,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -473,9 +477,10 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 				@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();

@@ -532,8 +537,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -550,8 +554,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -561,13 +564,10 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -679,11 +679,14 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	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);

 			}

 		}

 	}

@@ -696,8 +699,10 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	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;

 		}

@@ -718,11 +723,13 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 				@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 {

@@ -736,7 +743,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,7 +759,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,10 +772,10 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -798,13 +803,11 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -830,7 +833,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
index 4b5f96279af..74d97b557c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
@@ -75,7 +75,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(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusReflowableShapeEditPolicy());

 		// 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);

@@ -109,7 +110,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -120,7 +120,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -146,7 +145,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -187,7 +185,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		return getContentPane();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -196,7 +193,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -246,7 +242,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -270,8 +265,4 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
index d8679db4765..e6e2c2e6fc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
@@ -75,7 +75,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(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusReflowableShapeEditPolicy());

 		// 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);

@@ -109,7 +110,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -120,7 +120,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -146,7 +145,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -187,7 +185,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		return getContentPane();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -196,7 +193,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -246,7 +242,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -270,8 +265,4 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
index f85a61e2a2b..cec01b7ced7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class ComponentCompositeCompartmentEditPart

-		extends LinkLFShapeCompartmentEditPart {

+public class ComponentCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class ComponentCompositeCompartmentEditPart
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class ComponentCompositeCompartmentEditPart
 		return Messages.ComponentCompositeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class ComponentCompositeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class ComponentCompositeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
index 403fb07f27f..6cbab45aa66 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class ComponentCompositeCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class ComponentCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class ComponentCompositeCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class ComponentCompositeCompartmentEditPartCN
 		return Messages.ComponentCompositeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class ComponentCompositeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class ComponentCompositeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
index bf83bb7ab43..67d33ab0d16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
@@ -103,11 +103,15 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -160,7 +164,6 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -174,8 +177,7 @@ public class ComponentCompositeEditPart 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;

 				}

@@ -185,7 +187,6 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -211,24 +212,20 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ComponentCompositeCompartmentEditPart) {

 			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(((ComponentCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -304,7 +301,6 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -354,7 +350,6 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -378,8 +373,4 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentCompositeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
index 58c992a3ce9..c36fa5c6132 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
@@ -103,11 +103,15 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -160,7 +164,6 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -174,8 +177,7 @@ public class ComponentCompositeEditPartCN 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;

 				}

@@ -185,7 +187,6 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -211,24 +212,20 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {

 			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(((ComponentCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -304,7 +301,6 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -354,7 +350,6 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -378,8 +373,4 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentCompositeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPart.java
index 2dc537f6f16..52ff093b2e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ComponentCompositeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ComponentCompositeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ComponentCompositeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ComponentCompositeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class ComponentCompositeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class ComponentCompositeFloatingLabelEditPart extends
 					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(), ComponentCompositeFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ComponentCompositeFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class ComponentCompositeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class ComponentCompositeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class ComponentCompositeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class ComponentCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class ComponentCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class ComponentCompositeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class ComponentCompositeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class ComponentCompositeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class ComponentCompositeFloatingLabelEditPart extends
 				@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 +777,6 @@ public class ComponentCompositeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class ComponentCompositeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPartCN.java
index 8e926b8f50d..9155ca0f55a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ComponentCompositeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 					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(), ComponentCompositeFloatingLabelEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														ComponentCompositeFloatingLabelEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +466,18 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +489,8 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +516,10 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +570,7 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +587,7 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +597,10 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +712,14 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +732,10 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +756,13 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 				@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 +776,6 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +788,10 @@ public class ComponentCompositeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java
index 5f4a24b1b12..922f95b6e53 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 		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) {

@@ -290,8 +288,7 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ComponentCompositeNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														ComponentCompositeNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +442,18 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 					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;

 				}

@@ -461,7 +465,8 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +492,10 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 				@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();

@@ -546,8 +552,7 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +569,7 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +579,10 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +694,14 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +714,10 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	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;

 		}

@@ -732,11 +738,13 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 				@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 {

@@ -750,7 +758,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +774,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +787,10 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +807,8 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 				}

 			}

 		}

-		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);

@@ -815,13 +822,11 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +852,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java
index 6a4cb87b783..73b3286cae7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ComponentCompositeNameEditPartCN 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) {

@@ -290,8 +288,7 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ComponentCompositeNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ComponentCompositeNameEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +444,18 @@ public class ComponentCompositeNameEditPartCN 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;

 				}

@@ -461,7 +467,8 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class ComponentCompositeNameEditPartCN 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();

@@ -546,8 +554,7 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	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;

 		}

@@ -732,11 +740,13 @@ public class ComponentCompositeNameEditPartCN 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 {

@@ -750,7 +760,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class ComponentCompositeNameEditPartCN 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);

@@ -815,13 +824,11 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
index 01226cf1605..a868587309b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 		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,8 +295,7 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 		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());

 	}

 

@@ -318,12 +318,15 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 					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(), ComponentRealizationAppliedStereotypeEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														ComponentRealizationAppliedStereotypeEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -360,7 +363,8 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.ComponentRealization_Edge, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.ComponentRealization_Edge, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -447,13 +451,18 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 					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;

 				}

@@ -465,7 +474,8 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +501,10 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 				@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();

@@ -544,8 +555,7 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @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());

 		}

@@ -562,8 +572,7 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @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());

 		}

@@ -573,13 +582,10 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +689,14 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +709,10 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	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;

 		}

@@ -722,11 +733,13 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 				@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 {

@@ -740,7 +753,6 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +765,10 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java
index a166932f3c8..88a631b1e6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFi
 /**

  * @generated

  */

-public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,12 +53,11 @@ public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof ComponentRealizationNameEditPart) {

-			((ComponentRealizationNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+			((ComponentRealizationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {

-			((ComponentRealizationAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((ComponentRealizationAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
index 3260f5be20e..3c0c146b105 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 		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,8 +295,7 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 		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());

 	}

 

@@ -318,12 +318,16 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 					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(), ComponentRealizationNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ComponentRealizationNameEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -360,7 +364,8 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.ComponentRealization_Edge, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.ComponentRealization_Edge, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -447,13 +452,18 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 					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;

 				}

@@ -465,7 +475,8 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +502,10 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 				@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();

@@ -544,8 +556,7 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +573,7 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +583,10 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -691,11 +698,14 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 */

 	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);

 			}

 		}

 	}

@@ -708,8 +718,10 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	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;

 		}

@@ -730,11 +742,13 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 				@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 {

@@ -748,7 +762,6 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -761,10 +774,10 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java
index 7ba0936b172..cb8e0f90b47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java
@@ -56,10 +56,9 @@ public class CompositeStructureDiagramEditPart extends PapyrusDiagramEditPart {
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

-		installEditPolicy(AbstractShowHideRelatedLinkEditPolicy.SHOW_HIDE_RELATED_LINK_ROLE, new ShowHideRelatedLinkEditPolicy());

+		installEditPolicy(AbstractShowHideRelatedLinkEditPolicy.SHOW_HIDE_RELATED_LINK_ROLE,

+				new ShowHideRelatedLinkEditPolicy());

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);

 	}

 

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
index da0cb09b3a7..08ab4f8ba7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 		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,8 +295,7 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 		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());

 	}

 

@@ -318,12 +318,16 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 					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(), ConnectorAppliedStereotypeEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ConnectorAppliedStereotypeEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -447,13 +451,18 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 					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;

 				}

@@ -465,7 +474,8 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +501,10 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 				@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();

@@ -544,8 +555,7 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +572,7 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +582,10 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +689,14 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +709,10 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	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;

 		}

@@ -722,11 +733,13 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 				@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 {

@@ -740,7 +753,6 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +765,10 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java
index dfe4423fd82..737037e75e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ConnectorFigure;
 /**

  * @generated

  */

-public class ConnectorEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class ConnectorEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,20 +53,19 @@ public class ConnectorEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof ConnectorAppliedStereotypeEditPart) {

-			((ConnectorAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((ConnectorAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		if (childEditPart instanceof ConnectorNameEditPart) {

-			((ConnectorNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+			((ConnectorNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof ConnectorMultiplicitySourceEditPart) {

-			((ConnectorMultiplicitySourceEditPart) childEditPart).setLabel(

-					getPrimaryShape().getMultiplicitySourceLabel());

+			((ConnectorMultiplicitySourceEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getMultiplicitySourceLabel());

 		}

 		if (childEditPart instanceof ConnectorMultiplicityTargetEditPart) {

-			((ConnectorMultiplicityTargetEditPart) childEditPart).setLabel(

-					getPrimaryShape().getMultiplicityTargetLabel());

+			((ConnectorMultiplicityTargetEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getMultiplicityTargetLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
index 53bf4192045..6f4e2a395ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicitySourceEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicitySourceEditPart.VISUAL_ID),

+				new Point(0, 20));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 		return ConnectionLocator.SOURCE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 		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,8 +295,7 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 		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());

 	}

 

@@ -318,12 +318,16 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 					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(), ConnectorMultiplicitySourceEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ConnectorMultiplicitySourceEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -447,13 +451,18 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 					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;

 				}

@@ -465,7 +474,8 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +501,10 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 				@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();

@@ -544,8 +555,7 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +572,7 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +582,10 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +689,14 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +709,10 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	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;

 		}

@@ -722,11 +733,13 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 				@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 {

@@ -740,7 +753,6 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +765,10 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
index b5de9118c2c..fcc2f4453dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicityTargetEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicityTargetEditPart.VISUAL_ID),

+				new Point(0, 20));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 		return ConnectionLocator.TARGET;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 		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,8 +295,7 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 		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());

 	}

 

@@ -318,12 +318,16 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 					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(), ConnectorMultiplicityTargetEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ConnectorMultiplicityTargetEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -447,13 +451,18 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 					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;

 				}

@@ -465,7 +474,8 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +501,10 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 				@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();

@@ -544,8 +555,7 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +572,7 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +582,10 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +689,14 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +709,10 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	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;

 		}

@@ -722,11 +733,13 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 				@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 {

@@ -740,7 +753,6 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +765,10 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
index 0eff3e32eeb..9c4a961f98d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
@@ -86,7 +86,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConnectorNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class ConnectorNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -127,12 +128,14 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorNameEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry

+						.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorNameEditPart.VISUAL_ID),

+				new Point(0, -20));

 	}

 

 	/**

@@ -160,7 +163,6 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -276,8 +278,7 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 		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) {

@@ -308,8 +309,7 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 		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());

 	}

 

@@ -332,12 +332,13 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 					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(), ConnectorNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ConnectorNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -461,13 +462,18 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 					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;

 				}

@@ -479,7 +485,8 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -505,9 +512,10 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 				@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();

@@ -558,8 +566,7 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 * @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());

 		}

@@ -576,8 +583,7 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 * @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());

 		}

@@ -587,13 +593,10 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -705,11 +708,14 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 */

 	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);

 			}

 		}

 	}

@@ -722,8 +728,10 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	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;

 		}

@@ -744,11 +752,13 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 				@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 {

@@ -762,7 +772,6 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -775,10 +784,10 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 			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())) {

@@ -796,7 +805,8 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 			}

 		}

 

-		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);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java
index 577dabefee5..c08d198f364 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java
@@ -22,8 +22,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure
 /**

  * @generated

  */

-public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,10 +44,6 @@ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditP
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 	}

 

-

-

-

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
index a547a0e1d60..39f9aaf2835 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
@@ -74,7 +74,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());

 		// 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);

 	}

@@ -107,7 +108,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -118,7 +118,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -148,7 +147,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -192,7 +190,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		return getContentPane();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -201,7 +198,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -251,7 +247,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -275,8 +270,4 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
index 161df755d2a..833a53c15d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
@@ -74,7 +74,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());

 		// 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);

 	}

@@ -107,7 +108,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -118,7 +118,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -148,7 +147,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -192,7 +190,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 		return getContentPane();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -201,7 +198,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -251,7 +247,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -275,8 +270,4 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java
index 5c88271275b..2eaa018f5ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ConstraintNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 		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) {

@@ -290,8 +288,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						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();

@@ -443,13 +441,18 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 					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;

 				}

@@ -461,7 +464,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 				@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();

@@ -546,8 +551,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	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;

 		}

@@ -732,11 +737,13 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 				@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 {

@@ -750,7 +757,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java
index 996ed980ab7..4db216deb0d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 		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) {

@@ -290,8 +288,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						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();

@@ -443,13 +441,18 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 					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;

 				}

@@ -461,7 +464,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 				@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();

@@ -546,8 +551,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	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;

 		}

@@ -732,11 +737,13 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 				@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 {

@@ -750,7 +757,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java
index fdc536b07f5..96b8b73ed88 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java
@@ -79,7 +79,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -120,7 +121,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -138,7 +138,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -244,8 +243,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) {

@@ -276,8 +274,7 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 		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());

 	}

 

@@ -300,12 +297,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();

@@ -429,13 +428,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;

 				}

@@ -447,7 +451,8 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -473,9 +478,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();

@@ -532,8 +538,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());

 		}

@@ -550,8 +555,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());

 		}

@@ -561,13 +565,10 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -679,11 +680,14 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -696,8 +700,10 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	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;

 		}

@@ -718,11 +724,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 {

@@ -736,7 +744,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,7 +760,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,10 +773,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())) {

@@ -798,13 +804,11 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -830,7 +834,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java
index 81d48c696f0..e17a8ab0854 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java
@@ -79,7 +79,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -120,7 +121,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -138,7 +138,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -244,8 +243,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) {

@@ -276,8 +274,7 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 		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());

 	}

 

@@ -300,12 +297,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();

@@ -429,13 +430,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;

 				}

@@ -447,7 +453,8 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -473,9 +480,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();

@@ -532,8 +540,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());

 		}

@@ -550,8 +557,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());

 		}

@@ -561,13 +567,10 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -679,11 +682,14 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 */

 	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);

 			}

 		}

 	}

@@ -696,8 +702,10 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	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;

 		}

@@ -718,11 +726,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 {

@@ -736,7 +746,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,7 +762,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,10 +775,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())) {

@@ -798,13 +806,11 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -830,7 +836,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
index c1ee7ab71ae..ae67c1dc871 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
@@ -37,8 +37,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class DataTypeAttributeCompartmentEditPart

-		extends ListCompartmentEditPart {

+public class DataTypeAttributeCompartmentEditPart extends ListCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -66,7 +65,6 @@ public class DataTypeAttributeCompartmentEditPart
 		return Messages.DataTypeAttributeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -82,9 +80,6 @@ public class DataTypeAttributeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -126,10 +121,7 @@ public class DataTypeAttributeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
index b42caf2330f..ffe62c509b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
@@ -37,8 +37,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class DataTypeAttributeCompartmentEditPartCN

-		extends ListCompartmentEditPart {

+public class DataTypeAttributeCompartmentEditPartCN extends ListCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -66,7 +65,6 @@ public class DataTypeAttributeCompartmentEditPartCN
 		return Messages.DataTypeAttributeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -82,9 +80,6 @@ public class DataTypeAttributeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -126,10 +121,7 @@ public class DataTypeAttributeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
index f0bc6fcce70..55f544ea353 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
@@ -97,9 +97,12 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -149,7 +152,6 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -163,8 +165,7 @@ public class DataTypeEditPart 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,7 +175,6 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -200,17 +200,16 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof DataTypeAttributeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			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(((DataTypeAttributeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

 

 		if (childEditPart instanceof DataTypeOperationCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((DataTypeOperationCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

@@ -294,7 +293,6 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -344,7 +342,6 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -368,26 +365,24 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID));

 	}

 

-

-

 	/**

 	 * @generated

 	 */

 	public EditPart getTargetEditPart(Request request) {

 		if (request instanceof CreateViewAndElementRequest) {

-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor()

+					.getCreateElementRequestAdapter();

 			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);

 			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_AttributeLabel)) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID));

+				return getChildBySemanticHint(

+						UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID));

 			}

 			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_OperationLabel)) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID));

+				return getChildBySemanticHint(

+						UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID));

 			}

 		}

 		return super.getTargetEditPart(request);

 	}

 

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
index bba0e1e460a..3ed9053943c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
@@ -97,9 +97,12 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -149,7 +152,6 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -163,8 +165,7 @@ public class DataTypeEditPartCN 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,7 +175,6 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -200,17 +200,16 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			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(((DataTypeAttributeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

 

 		if (childEditPart instanceof DataTypeOperationCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

 			pane.add(((DataTypeOperationCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

@@ -294,7 +293,6 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -344,7 +342,6 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -368,25 +365,24 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

 	/**

 	 * @generated

 	 */

 	public EditPart getTargetEditPart(Request request) {

 		if (request instanceof CreateViewAndElementRequest) {

-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor()

+					.getCreateElementRequestAdapter();

 			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);

 			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_AttributeLabel)) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));

+				return getChildBySemanticHint(

+						UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));

 			}

 			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_OperationLabel)) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID));

+				return getChildBySemanticHint(

+						UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID));

 			}

 		}

 		return super.getTargetEditPart(request);

 	}

 

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPart.java
index eccec2ee3c5..cb73f2cf0d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DataTypeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class DataTypeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class DataTypeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class DataTypeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class DataTypeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class DataTypeFloatingLabelEditPart extends
 					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(), DataTypeFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														DataTypeFloatingLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +465,18 @@ public class DataTypeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class DataTypeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class DataTypeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +569,7 @@ public class DataTypeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class DataTypeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class DataTypeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class DataTypeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class DataTypeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class DataTypeFloatingLabelEditPart extends
 				@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 +775,6 @@ public class DataTypeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class DataTypeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPartCN.java
index c2a34b71200..5a3decc292d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DataTypeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class DataTypeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class DataTypeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class DataTypeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class DataTypeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class DataTypeFloatingLabelEditPartCN extends
 					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(), DataTypeFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														DataTypeFloatingLabelEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +465,18 @@ public class DataTypeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class DataTypeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class DataTypeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +569,7 @@ public class DataTypeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class DataTypeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class DataTypeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class DataTypeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class DataTypeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class DataTypeFloatingLabelEditPartCN extends
 				@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 +775,6 @@ public class DataTypeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class DataTypeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java
index a06206e72d5..5717f99dfd4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class DataTypeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 		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) {

@@ -290,8 +288,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DataTypeNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), DataTypeNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 					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;

 				}

@@ -461,7 +464,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 				@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();

@@ -546,8 +551,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	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;

 		}

@@ -732,11 +737,13 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 				@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 {

@@ -750,7 +757,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java
index f52b9e5f69f..ec7246f8ca5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 		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) {

@@ -290,8 +288,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DataTypeNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), DataTypeNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 					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;

 				}

@@ -461,7 +464,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 				@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();

@@ -546,8 +551,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	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;

 		}

@@ -732,11 +737,13 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 				@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 {

@@ -750,7 +757,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
index ee2b3ed237e..b1d567e67f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
@@ -37,8 +37,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class DataTypeOperationCompartmentEditPart

-		extends ListCompartmentEditPart {

+public class DataTypeOperationCompartmentEditPart extends ListCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -66,7 +65,6 @@ public class DataTypeOperationCompartmentEditPart
 		return Messages.DataTypeOperationCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -82,9 +80,6 @@ public class DataTypeOperationCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -126,10 +121,7 @@ public class DataTypeOperationCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
index 8c5b239b230..06b3883d43a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
@@ -37,8 +37,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class DataTypeOperationCompartmentEditPartCN

-		extends ListCompartmentEditPart {

+public class DataTypeOperationCompartmentEditPartCN extends ListCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -66,7 +65,6 @@ public class DataTypeOperationCompartmentEditPartCN
 		return Messages.DataTypeOperationCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -82,9 +80,6 @@ public class DataTypeOperationCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -126,10 +121,7 @@ public class DataTypeOperationCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
index c812f77a334..8dff2428927 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 		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,8 +295,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 		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());

 	}

 

@@ -318,12 +318,16 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 					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();

@@ -447,13 +451,18 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 					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;

 				}

@@ -465,7 +474,8 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +501,10 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 				@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();

@@ -544,8 +555,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +572,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +582,10 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +689,14 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +709,10 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	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;

 		}

@@ -722,11 +733,13 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 				@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 {

@@ -740,7 +753,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +765,10 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java
index 9c293f47cb0..ea5896e5c9f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
 /**

  * @generated

  */

-public class DependencyEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,12 +53,11 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof DependencyNameEditPart) {

-			((DependencyNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+			((DependencyNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof DependencyAppliedStereotypeEditPart) {

-			((DependencyAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((DependencyAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
index f459c845c35..c80a0c41e52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class DependencyNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry

+						.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyNameEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 		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,8 +295,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 		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());

 	}

 

@@ -318,12 +318,13 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 					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();

@@ -447,13 +448,18 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 					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;

 				}

@@ -465,7 +471,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +498,10 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 				@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();

@@ -544,8 +552,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @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());

 		}

@@ -562,8 +569,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @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());

 		}

@@ -573,13 +579,10 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -691,11 +694,14 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 */

 	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);

 			}

 		}

 	}

@@ -708,8 +714,10 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	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;

 		}

@@ -730,11 +738,13 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 				@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 {

@@ -748,7 +758,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -761,10 +770,10 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
index 726ead0f8b8..3f43f65b62d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 		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,8 +295,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 		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());

 	}

 

@@ -318,12 +318,16 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 					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();

@@ -447,13 +451,18 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 					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;

 				}

@@ -465,7 +474,8 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +501,10 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 				@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();

@@ -544,8 +555,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +572,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +582,10 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +689,14 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +709,10 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	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;

 		}

@@ -722,11 +733,13 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 				@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 {

@@ -740,7 +753,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +765,10 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java
index 748cece2d92..ed573a59bea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
 /**

  * @generated

  */

-public class DeploymentEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,12 +53,11 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof DeploymentNameEditPart) {

-			((DeploymentNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+			((DeploymentNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof DeploymentAppliedStereotypeEditPart) {

-			((DeploymentAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((DeploymentAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
index 173ec81bde7..89b6e360601 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class DeploymentNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry

+						.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentNameEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 		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,8 +295,7 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 		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());

 	}

 

@@ -318,12 +318,13 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 					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();

@@ -447,13 +448,18 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 					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;

 				}

@@ -465,7 +471,8 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +498,10 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 				@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();

@@ -544,8 +552,7 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @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());

 		}

@@ -562,8 +569,7 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @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());

 		}

@@ -573,13 +579,10 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -691,11 +694,14 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 */

 	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);

 			}

 		}

 	}

@@ -708,8 +714,10 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	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;

 		}

@@ -730,11 +738,13 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 				@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 {

@@ -748,7 +758,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -761,10 +770,10 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
index 6647ef2fed2..6c907d7b861 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
@@ -89,7 +89,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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,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;

 				}

@@ -164,7 +163,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
index 69aca5440ff..5daff0a8a1d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
@@ -89,7 +89,8 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 

 		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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 		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;

 				}

@@ -164,7 +163,6 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPart.java
index 9d3b2094ea7..01d5ac347b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeploymentSpecificationFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 					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();

@@ -378,7 +379,8 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 	 */

 	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;

 	}

@@ -465,13 +467,18 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 				@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 +777,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class DeploymentSpecificationFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPartCN.java
index a4fe6548703..88f675d9731 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeploymentSpecificationFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 					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(), DeploymentSpecificationFloatingLabelEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														DeploymentSpecificationFloatingLabelEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -378,7 +379,8 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 	 */

 	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;

 	}

@@ -465,13 +467,18 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java
index 475cb640d5c..14721e45951 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,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) {

@@ -290,8 +288,7 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 		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());

 	}

 

@@ -314,12 +311,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();

@@ -356,7 +357,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 */

 	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;

 	}

@@ -443,13 +445,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;

 				}

@@ -461,7 +468,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +495,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();

@@ -546,8 +555,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());

 		}

@@ -564,8 +572,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());

 		}

@@ -575,13 +582,10 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +697,14 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +717,10 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	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;

 		}

@@ -732,11 +741,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 {

@@ -750,7 +761,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +777,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +790,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())) {

@@ -801,7 +810,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 				}

 			}

 		}

-		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);

@@ -815,13 +825,11 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +855,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java
index cb94fa8a0e8..6a9d4633893 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 		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) {

@@ -290,8 +288,7 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeploymentSpecificationNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																DeploymentSpecificationNameEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +357,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	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;

 	}

@@ -443,13 +445,18 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 					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;

 				}

@@ -461,7 +468,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +495,10 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 				@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();

@@ -546,8 +555,7 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +572,7 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +582,10 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +697,14 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +717,10 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	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;

 		}

@@ -732,11 +741,13 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 				@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 {

@@ -750,7 +761,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +777,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +790,10 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +810,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 				}

 			}

 		}

-		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);

@@ -815,13 +825,11 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +855,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
index 6f8902b14be..ee9420d162b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class DeviceCompositeCompartmentEditPart

-		extends LinkLFShapeCompartmentEditPart {

+public class DeviceCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class DeviceCompositeCompartmentEditPart
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class DeviceCompositeCompartmentEditPart
 		return Messages.DeviceCompositeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class DeviceCompositeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class DeviceCompositeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
index bc364032454..808eedbf02d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class DeviceCompositeCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class DeviceCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class DeviceCompositeCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class DeviceCompositeCompartmentEditPartCN
 		return Messages.DeviceCompositeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class DeviceCompositeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class DeviceCompositeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
index 532101f1cb2..957749022fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
@@ -103,11 +103,15 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -160,7 +164,6 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -174,8 +177,7 @@ public class DeviceCompositeEditPart 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;

 				}

@@ -185,7 +187,6 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -211,24 +212,20 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 			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;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -304,7 +301,6 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -354,7 +350,6 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -378,8 +373,4 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceCompositeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
index 72127af9913..d8b391bbdc0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
@@ -103,11 +103,15 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -160,7 +164,6 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -174,8 +177,7 @@ public class DeviceCompositeEditPartCN 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;

 				}

@@ -185,7 +187,6 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -211,24 +212,20 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 			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;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -304,7 +301,6 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -354,7 +350,6 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -378,8 +373,4 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceCompositeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPart.java
index 55778a7ce01..1f23a237214 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeviceCompositeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class DeviceCompositeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class DeviceCompositeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class DeviceCompositeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class DeviceCompositeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class DeviceCompositeFloatingLabelEditPart extends
 					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(), DeviceCompositeFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																DeviceCompositeFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class DeviceCompositeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class DeviceCompositeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class DeviceCompositeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class DeviceCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class DeviceCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class DeviceCompositeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class DeviceCompositeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class DeviceCompositeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class DeviceCompositeFloatingLabelEditPart extends
 				@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 +777,6 @@ public class DeviceCompositeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class DeviceCompositeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPartCN.java
index 9b54c435695..fbb9f465d33 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeviceCompositeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 					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(), DeviceCompositeFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																DeviceCompositeFloatingLabelEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class DeviceCompositeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java
index a80243499b3..c5b3b48b175 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 		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) {

@@ -290,8 +288,7 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeviceCompositeNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), DeviceCompositeNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 					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;

 				}

@@ -461,7 +464,8 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 				@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();

@@ -546,8 +551,7 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	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;

 		}

@@ -732,11 +737,13 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 				@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 {

@@ -750,7 +757,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java
index 7b5bc73fb82..53f0e34bb6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 		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) {

@@ -290,8 +288,7 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DeviceCompositeNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														DeviceCompositeNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +442,18 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 					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;

 				}

@@ -461,7 +465,8 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +492,10 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 				@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();

@@ -546,8 +552,7 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +569,7 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +579,10 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +694,14 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +714,10 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	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;

 		}

@@ -732,11 +738,13 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 				@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 {

@@ -750,7 +758,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +774,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +787,10 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +807,8 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 				}

 			}

 		}

-		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);

@@ -815,13 +822,11 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +852,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
index 924ba838a09..69978ac75a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
@@ -74,7 +74,8 @@ public class DurationConstraintEditPart 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());

 		// 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);

 	}

@@ -107,7 +108,6 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -118,7 +118,6 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -148,7 +147,6 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -192,7 +190,6 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 		return getContentPane();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -201,7 +198,6 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -251,7 +247,6 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -275,8 +270,4 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationConstraintNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
index b2aa2d5c777..cd7df248bde 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
@@ -74,7 +74,8 @@ public class DurationConstraintEditPartCN 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());

 		// 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);

 	}

@@ -107,7 +108,6 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -118,7 +118,6 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -144,11 +143,11 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 			return true;

 		}

 		if (childEditPart instanceof DurationConstraintSpecificationEditPartCN) {

-			((DurationConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			((DurationConstraintSpecificationEditPartCN) childEditPart)

+					.setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -192,7 +191,6 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 		return getContentPane();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -201,7 +199,6 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -251,7 +248,6 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -275,8 +271,4 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationConstraintNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java
index 3d7a5946d5f..a1b089fc5a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		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) {

@@ -290,8 +288,7 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DurationConstraintNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														DurationConstraintNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +355,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DurationConstraint_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DurationConstraint_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +443,18 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 					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;

 				}

@@ -461,7 +466,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +493,10 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 				@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();

@@ -546,8 +553,7 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +570,7 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +580,10 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +695,14 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +715,10 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	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;

 		}

@@ -732,11 +739,13 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 				@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 {

@@ -750,7 +759,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +775,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +788,10 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +808,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 				}

 			}

 		}

-		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);

@@ -815,13 +823,11 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +853,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java
index 4f8b16eea72..d27a7568613 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class DurationConstraintNameEditPartCN 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) {

@@ -290,8 +288,7 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DurationConstraintNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																DurationConstraintNameEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +357,8 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DurationConstraint_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DurationConstraint_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +445,18 @@ public class DurationConstraintNameEditPartCN 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;

 				}

@@ -461,7 +468,8 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +495,10 @@ public class DurationConstraintNameEditPartCN 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();

@@ -546,8 +555,7 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +572,7 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +582,10 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +697,14 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +717,10 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	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;

 		}

@@ -732,11 +741,13 @@ public class DurationConstraintNameEditPartCN 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 {

@@ -750,7 +761,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +777,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +790,10 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +810,8 @@ public class DurationConstraintNameEditPartCN 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);

@@ -815,13 +825,11 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +855,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java
index e93b899fac5..3ec2e914245 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java
@@ -79,7 +79,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -120,7 +121,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -138,7 +138,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -244,8 +243,7 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 		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,8 +274,7 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 		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());

 	}

 

@@ -300,12 +297,16 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DurationConstraintSpecificationEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																DurationConstraintSpecificationEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -342,7 +343,8 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DurationConstraint_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DurationConstraint_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -429,13 +431,18 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 					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;

 				}

@@ -447,7 +454,8 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -473,9 +481,10 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 				@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();

@@ -532,8 +541,7 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -550,8 +558,7 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -561,13 +568,10 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -679,11 +683,14 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	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);

 			}

 		}

 	}

@@ -696,8 +703,10 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	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;

 		}

@@ -718,11 +727,13 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 				@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 {

@@ -736,7 +747,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,7 +763,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,10 +776,10 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -798,13 +807,11 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -830,7 +837,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java
index 47384aa7bfa..f10ffb31bc3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java
@@ -79,7 +79,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -120,7 +121,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -138,7 +138,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -244,8 +243,7 @@ public class DurationConstraintSpecificationEditPartCN 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) {

@@ -276,8 +274,7 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		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());

 	}

 

@@ -300,12 +297,15 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DurationConstraintSpecificationEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														DurationConstraintSpecificationEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -342,7 +342,8 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DurationConstraint_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DurationConstraint_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -429,13 +430,18 @@ public class DurationConstraintSpecificationEditPartCN 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;

 				}

@@ -447,7 +453,8 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -473,9 +480,10 @@ public class DurationConstraintSpecificationEditPartCN 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();

@@ -532,8 +540,7 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -550,8 +557,7 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -561,13 +567,10 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -679,11 +682,14 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	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);

 			}

 		}

 	}

@@ -696,8 +702,10 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	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;

 		}

@@ -718,11 +726,13 @@ public class DurationConstraintSpecificationEditPartCN 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 {

@@ -736,7 +746,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,7 +762,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,10 +775,10 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -798,13 +806,11 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -830,7 +836,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
index 600ca6652f8..351d5d3e728 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
@@ -89,7 +89,8 @@ public class DurationEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class DurationEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationFloatingLabelEditPart.java
index bcb0bd16667..4dcd69532ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class DurationFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class DurationFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class DurationFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class DurationFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class DurationFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class DurationFloatingLabelEditPart extends
 					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(), DurationFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														DurationFloatingLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +465,18 @@ public class DurationFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class DurationFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class DurationFloatingLabelEditPart extends
 				@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();

@@ -562,8 +569,7 @@ public class DurationFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class DurationFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class DurationFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class DurationFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class DurationFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class DurationFloatingLabelEditPart extends
 				@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 +775,6 @@ public class DurationFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class DurationFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
index 3a565551001..47120a891d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
@@ -89,7 +89,8 @@ public class DurationIntervalEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class DurationIntervalEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationIntervalNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalFloatingLabelEditPart.java
index 69ad3a17495..edaf8fcc3ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationIntervalFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class DurationIntervalFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationIntervalFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationIntervalFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class DurationIntervalFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class DurationIntervalFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class DurationIntervalFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class DurationIntervalFloatingLabelEditPart extends
 					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(), DurationIntervalFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																DurationIntervalFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class DurationIntervalFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class DurationIntervalFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class DurationIntervalFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class DurationIntervalFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class DurationIntervalFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class DurationIntervalFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class DurationIntervalFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class DurationIntervalFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class DurationIntervalFloatingLabelEditPart extends
 				@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 +777,6 @@ public class DurationIntervalFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class DurationIntervalFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java
index b1515246fc7..2e85730ce9a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 		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) {

@@ -290,8 +288,7 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DurationIntervalNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														DurationIntervalNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +442,18 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 					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;

 				}

@@ -461,7 +465,8 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +492,10 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 				@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();

@@ -546,8 +552,7 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +569,7 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +579,10 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +694,14 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +714,10 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	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;

 		}

@@ -732,11 +738,13 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 				@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 {

@@ -750,7 +758,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +774,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +787,10 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +807,8 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 				}

 			}

 		}

-		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);

@@ -815,13 +822,11 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +852,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java
index 720550900a4..3872dabab0e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class DurationNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 		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) {

@@ -290,8 +288,7 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DurationNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), DurationNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 					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;

 				}

@@ -461,7 +464,8 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 				@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();

@@ -546,8 +551,7 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	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;

 		}

@@ -732,11 +737,13 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 				@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 {

@@ -750,7 +757,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
index 4ca635a7640..917e8a78d1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
@@ -89,7 +89,8 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeIconlDisplayEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ObservationLayoutEditPolicy());

@@ -143,7 +144,6 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -157,8 +157,7 @@ public class DurationObservationEditPart 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;

 				}

@@ -168,7 +167,6 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -185,7 +183,6 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 		return (RoundedCompartmentFigure) primaryShape;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -209,7 +206,6 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -254,7 +250,6 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -278,8 +273,4 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEventEditPart.java
index 4c61d57edb5..e940f828f4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEventEditPart.java
@@ -22,8 +22,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure
 /**

  * @generated

  */

-public class DurationObservationEventEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart {

+public class DurationObservationEventEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,10 +44,6 @@ public class DurationObservationEventEditPart extends ConnectionEditPart
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 	}

 

-

-

-

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java
index f116c382f43..a7ecf9e999c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java
@@ -84,8 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationObservationNameEditPart extends

-		FloatingLabelEditPart

+public class DurationObservationNameEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {

 

 	/**

@@ -127,12 +126,14 @@ public class DurationObservationNameEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationNameEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationNameEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -175,7 +176,6 @@ public class DurationObservationNameEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -281,8 +281,7 @@ public class DurationObservationNameEditPart extends
 		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) {

@@ -313,8 +312,7 @@ public class DurationObservationNameEditPart extends
 		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());

 	}

 

@@ -337,12 +335,14 @@ public class DurationObservationNameEditPart extends
 					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(), DurationObservationNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														DurationObservationNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -379,7 +379,8 @@ public class DurationObservationNameEditPart extends
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DurationObservation_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DurationObservation_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -466,13 +467,18 @@ public class DurationObservationNameEditPart extends
 					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;

 				}

@@ -484,7 +490,8 @@ public class DurationObservationNameEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -510,9 +517,10 @@ public class DurationObservationNameEditPart extends
 				@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();

@@ -563,8 +571,7 @@ public class DurationObservationNameEditPart extends
 	 * @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());

 		}

@@ -581,8 +588,7 @@ public class DurationObservationNameEditPart extends
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -592,13 +598,10 @@ public class DurationObservationNameEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -710,11 +713,14 @@ public class DurationObservationNameEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -727,8 +733,10 @@ public class DurationObservationNameEditPart extends
 	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;

 		}

@@ -749,11 +757,13 @@ public class DurationObservationNameEditPart extends
 				@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 {

@@ -767,7 +777,6 @@ public class DurationObservationNameEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -780,10 +789,10 @@ public class DurationObservationNameEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
index 2f95de43611..36d03a743f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
@@ -86,8 +86,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationObservationStereotypeLabelEditPart extends

-		AbstractLabelEditPart

+public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {

 

 	/**

@@ -129,12 +128,14 @@ public class DurationObservationStereotypeLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -151,7 +152,8 @@ public class DurationObservationStereotypeLabelEditPart extends
 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeExternalNodeEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

 	}

 

@@ -178,7 +180,6 @@ public class DurationObservationStereotypeLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -284,8 +285,7 @@ public class DurationObservationStereotypeLabelEditPart extends
 		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) {

@@ -316,8 +316,7 @@ public class DurationObservationStereotypeLabelEditPart extends
 		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());

 	}

 

@@ -340,12 +339,15 @@ public class DurationObservationStereotypeLabelEditPart extends
 					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(), DurationObservationStereotypeLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														DurationObservationStereotypeLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -382,7 +384,8 @@ public class DurationObservationStereotypeLabelEditPart extends
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.DurationObservation_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.DurationObservation_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -469,13 +472,18 @@ public class DurationObservationStereotypeLabelEditPart extends
 					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;

 				}

@@ -487,7 +495,8 @@ public class DurationObservationStereotypeLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -513,9 +522,10 @@ public class DurationObservationStereotypeLabelEditPart extends
 				@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();

@@ -566,8 +576,7 @@ public class DurationObservationStereotypeLabelEditPart extends
 	 * @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());

 		}

@@ -584,8 +593,7 @@ public class DurationObservationStereotypeLabelEditPart extends
 	 * @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());

 		}

@@ -595,13 +603,10 @@ public class DurationObservationStereotypeLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -713,11 +718,14 @@ public class DurationObservationStereotypeLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -730,8 +738,10 @@ public class DurationObservationStereotypeLabelEditPart extends
 	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;

 		}

@@ -752,11 +762,13 @@ public class DurationObservationStereotypeLabelEditPart extends
 				@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 {

@@ -770,7 +782,6 @@ public class DurationObservationStereotypeLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -783,10 +794,10 @@ public class DurationObservationStereotypeLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
index 423b54df634..f47a35e2721 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
@@ -99,9 +99,12 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -151,7 +154,6 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -165,8 +167,7 @@ public class EnumerationEditPart 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;

 				}

@@ -176,7 +177,6 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -202,10 +202,9 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();

-			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(((EnumerationEnumerationLiteralCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

@@ -281,7 +280,6 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -331,7 +329,6 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -355,23 +352,20 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID));

 	}

 

-

-

 	/**

 	 * @generated

 	 */

 	public EditPart getTargetEditPart(Request request) {

 		if (request instanceof CreateViewAndElementRequest) {

-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor()

+					.getCreateElementRequestAdapter();

 			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);

 			if (UMLElementTypes.isKindOf(type, UMLElementTypes.EnumerationLiteral_LiteralLabel)) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));

+				return getChildBySemanticHint(

+						UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));

 			}

 		}

 		return super.getTargetEditPart(request);

 	}

 

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
index 658fdd242b6..217af25eb25 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
@@ -99,9 +99,12 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -151,7 +154,6 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -165,8 +167,7 @@ public class EnumerationEditPartCN 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;

 				}

@@ -176,7 +177,6 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -202,10 +202,9 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();

-			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(((EnumerationEnumerationLiteralCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

@@ -281,7 +280,6 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -331,7 +329,6 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -355,22 +352,20 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID));

 	}

 

-

-

 	/**

 	 * @generated

 	 */

 	public EditPart getTargetEditPart(Request request) {

 		if (request instanceof CreateViewAndElementRequest) {

-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor()

+					.getCreateElementRequestAdapter();

 			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);

 			if (UMLElementTypes.isKindOf(type, UMLElementTypes.EnumerationLiteral_LiteralLabel)) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));

+				return getChildBySemanticHint(

+						UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));

 			}

 		}

 		return super.getTargetEditPart(request);

 	}

 

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
index ca4299f9f51..577680a7ae3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
@@ -37,8 +37,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class EnumerationEnumerationLiteralCompartmentEditPart

-		extends ListCompartmentEditPart {

+public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -66,7 +65,6 @@ public class EnumerationEnumerationLiteralCompartmentEditPart
 		return Messages.EnumerationEnumerationLiteralCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -82,9 +80,6 @@ public class EnumerationEnumerationLiteralCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -126,10 +121,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
index 69a1cd8073b..91c85f4cc7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
@@ -37,8 +37,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class EnumerationEnumerationLiteralCompartmentEditPartCN

-		extends ListCompartmentEditPart {

+public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -66,7 +65,6 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN
 		return Messages.EnumerationEnumerationLiteralCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -82,9 +80,6 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -126,10 +121,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPart.java
index 497944be2f2..bfd6a69e68a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class EnumerationFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class EnumerationFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class EnumerationFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class EnumerationFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class EnumerationFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class EnumerationFloatingLabelEditPart extends
 					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(), EnumerationFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																EnumerationFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class EnumerationFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class EnumerationFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class EnumerationFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class EnumerationFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class EnumerationFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class EnumerationFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class EnumerationFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class EnumerationFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class EnumerationFloatingLabelEditPart extends
 				@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 +777,6 @@ public class EnumerationFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class EnumerationFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPartCN.java
index e94a369809c..b5ef227fb61 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class EnumerationFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class EnumerationFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class EnumerationFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class EnumerationFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class EnumerationFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class EnumerationFloatingLabelEditPartCN extends
 					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(), EnumerationFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																EnumerationFloatingLabelEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class EnumerationFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class EnumerationFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class EnumerationFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class EnumerationFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class EnumerationFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class EnumerationFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class EnumerationFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class EnumerationFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class EnumerationFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class EnumerationFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class EnumerationFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java
index c372a269b1c..5a062af7f5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java
@@ -133,7 +133,6 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -162,7 +161,6 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -278,8 +276,7 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 		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) {

@@ -310,8 +307,7 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 		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());

 	}

 

@@ -334,12 +330,14 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 					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(), EnumerationLiteralEditPartCLN.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														EnumerationLiteralEditPartCLN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -376,7 +374,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.EnumerationLiteral_LiteralLabel, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.EnumerationLiteral_LiteralLabel, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -463,13 +462,18 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 					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;

 				}

@@ -481,7 +485,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -507,9 +512,10 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 				@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();

@@ -566,8 +572,7 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 	 * @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());

 		}

@@ -584,8 +589,7 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 	 * @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());

 		}

@@ -595,13 +599,10 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -713,11 +714,14 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -730,8 +734,10 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 	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;

 		}

@@ -752,11 +758,13 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 				@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 {

@@ -770,7 +778,6 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -799,10 +806,10 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 			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 +826,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
 				}

 			}

 		}

-		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();

 		}

 		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java
index bf8ccbaef60..c6d09b233cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class EnumerationNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 		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) {

@@ -290,8 +288,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), EnumerationNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), EnumerationNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 					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;

 				}

@@ -461,7 +464,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 				@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();

@@ -546,8 +551,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	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;

 		}

@@ -732,11 +737,13 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 				@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 {

@@ -750,7 +757,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java
index 7451316916b..825e9429d98 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 		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) {

@@ -290,8 +288,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), EnumerationNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), EnumerationNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 					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;

 				}

@@ -461,7 +464,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 				@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();

@@ -546,8 +551,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	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;

 		}

@@ -732,11 +737,13 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 				@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 {

@@ -750,7 +757,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
index cd7ce92e766..5ce01838a78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class ExecutionEnvironmentCompositeCompartmentEditPart

-		extends LinkLFShapeCompartmentEditPart {

+public class ExecutionEnvironmentCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart
 		return Messages.ExecutionEnvironmentCompositeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
index d78bce390f6..ba1dd60dddf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class ExecutionEnvironmentCompositeCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN
 		return Messages.ExecutionEnvironmentCompositeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
index 440c3381cd9..798a81d94fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
@@ -103,11 +103,15 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -160,7 +164,6 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -174,8 +177,7 @@ public class ExecutionEnvironmentCompositeEditPart 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;

 				}

@@ -185,7 +187,6 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -211,24 +212,20 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 			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;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -304,7 +301,6 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -354,7 +350,6 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -378,8 +373,4 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
index de9f5c388d5..2e930f0dbd3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
@@ -103,11 +103,15 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -160,7 +164,6 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -174,8 +177,7 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 		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;

 				}

@@ -185,7 +187,6 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -211,24 +212,20 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 			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;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -304,7 +301,6 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -354,7 +350,6 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -375,11 +370,8 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 	 * @generated

 	 */

 	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));

+		return getChildBySemanticHint(

+				UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPart.java
index 7c009e60c8b..9724bee2a72 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 					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(), ExecutionEnvironmentCompositeFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														ExecutionEnvironmentCompositeFloatingLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -378,7 +379,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 	 */

 	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;

 	}

@@ -465,13 +467,18 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 				@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 +777,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPartCN.java
index 749abac607e..de99a5eab6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 					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(), ExecutionEnvironmentCompositeFloatingLabelEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														ExecutionEnvironmentCompositeFloatingLabelEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -378,7 +379,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 	 */

 	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;

 	}

@@ -465,13 +467,18 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java
index fa9e4c83e2e..64a9b1dfdef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ExecutionEnvironmentCompositeNameEditPart 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) {

@@ -290,8 +288,7 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 		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());

 	}

 

@@ -314,12 +311,15 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ExecutionEnvironmentCompositeNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														ExecutionEnvironmentCompositeNameEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +356,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	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;

 	}

@@ -443,13 +444,18 @@ public class ExecutionEnvironmentCompositeNameEditPart 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;

 				}

@@ -461,7 +467,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class ExecutionEnvironmentCompositeNameEditPart 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();

@@ -546,8 +554,7 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	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;

 		}

@@ -732,11 +740,13 @@ public class ExecutionEnvironmentCompositeNameEditPart 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 {

@@ -750,7 +760,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 				}

 			}

 		}

-		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);

@@ -815,13 +824,11 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java
index 4a0c218dede..735b0496111 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 		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) {

@@ -290,8 +288,7 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 		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());

 	}

 

@@ -314,12 +311,15 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ExecutionEnvironmentCompositeNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														ExecutionEnvironmentCompositeNameEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +356,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	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;

 	}

@@ -443,13 +444,18 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 					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;

 				}

@@ -461,7 +467,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 				@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();

@@ -546,8 +554,7 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	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;

 		}

@@ -732,11 +740,13 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 				@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 {

@@ -750,7 +760,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 				}

 			}

 		}

-		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);

@@ -815,13 +824,11 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
index 525d5d2a8b6..86222d6f1c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
@@ -89,7 +89,8 @@ public class ExpressionEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class ExpressionEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExpressionNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionFloatingLabelEditPart.java
index 7fe8df4bc0d..30701777ed1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ExpressionFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ExpressionFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExpressionFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExpressionFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ExpressionFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ExpressionFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class ExpressionFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class ExpressionFloatingLabelEditPart extends
 					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(), ExpressionFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														ExpressionFloatingLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +465,18 @@ public class ExpressionFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class ExpressionFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class ExpressionFloatingLabelEditPart extends
 				@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();

@@ -562,8 +569,7 @@ public class ExpressionFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class ExpressionFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class ExpressionFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class ExpressionFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class ExpressionFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class ExpressionFloatingLabelEditPart extends
 				@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 +775,6 @@ public class ExpressionFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class ExpressionFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java
index fe3f3b22675..c790c6ee1d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ExpressionNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 		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) {

@@ -290,8 +288,7 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ExpressionNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ExpressionNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 					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;

 				}

@@ -461,7 +464,8 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 				@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();

@@ -546,8 +551,7 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	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;

 		}

@@ -732,11 +737,13 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 				@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 {

@@ -750,7 +757,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
index 01da2b8465a..2e92b49ae56 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class FunctionBehaviorCompositeCompartmentEditPart

-		extends LinkLFShapeCompartmentEditPart {

+public class FunctionBehaviorCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class FunctionBehaviorCompositeCompartmentEditPart
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class FunctionBehaviorCompositeCompartmentEditPart
 		return Messages.FunctionBehaviorCompositeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class FunctionBehaviorCompositeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class FunctionBehaviorCompositeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
index e8ec63018bf..b18adb10bd8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class FunctionBehaviorCompositeCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class FunctionBehaviorCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class FunctionBehaviorCompositeCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class FunctionBehaviorCompositeCompartmentEditPartCN
 		return Messages.FunctionBehaviorCompositeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class FunctionBehaviorCompositeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class FunctionBehaviorCompositeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
index b565bc08c20..e08c1b2dfde 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
@@ -103,11 +103,15 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -161,7 +165,6 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -175,8 +178,7 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 		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;

 				}

@@ -186,7 +188,6 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -212,34 +213,27 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 			return true;

 		}

 

-

 		if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {

 			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(((FunctionBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -319,7 +313,6 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -369,7 +362,6 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -393,8 +385,4 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
index 5c902220f34..7cf9ef7ae46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
@@ -103,11 +103,15 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -161,7 +165,6 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -175,8 +178,7 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 		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;

 				}

@@ -186,7 +188,6 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -212,34 +213,27 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 			return true;

 		}

 

-

 		if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {

 			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(((FunctionBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -319,7 +313,6 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -369,7 +362,6 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -393,8 +385,4 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPart.java
index a050c66a56b..ede560e329e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class FunctionBehaviorCompositeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 					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(), FunctionBehaviorCompositeFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														FunctionBehaviorCompositeFloatingLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +466,18 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +489,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +516,10 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +570,7 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +587,7 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +597,10 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +712,14 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +732,10 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +756,13 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 				@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 +776,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +788,10 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPartCN.java
index 8c81220483c..a1c2b96d2f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 					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(), FunctionBehaviorCompositeFloatingLabelEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														FunctionBehaviorCompositeFloatingLabelEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -378,7 +379,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.FunctionBehavior_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.FunctionBehavior_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -465,13 +467,18 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java
index 2b5ee483380..bac07ba0df7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 		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) {

@@ -290,8 +288,7 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), FunctionBehaviorCompositeNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																FunctionBehaviorCompositeNameEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +444,18 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 					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;

 				}

@@ -461,7 +467,8 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 				@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();

@@ -546,8 +554,7 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	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;

 		}

@@ -732,11 +740,13 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 				@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 {

@@ -750,7 +760,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 				}

 			}

 		}

-		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);

@@ -815,13 +824,11 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java
index 4b7d9f67f61..e1ae9df29ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 		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) {

@@ -290,8 +288,7 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), FunctionBehaviorCompositeNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																FunctionBehaviorCompositeNameEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +357,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.FunctionBehavior_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.FunctionBehavior_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +445,18 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 					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;

 				}

@@ -461,7 +468,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +495,10 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 				@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();

@@ -546,8 +555,7 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +572,7 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +582,10 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +697,14 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +717,10 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	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;

 		}

@@ -732,11 +741,13 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 				@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 {

@@ -750,7 +761,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +777,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +790,10 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +810,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 				}

 			}

 		}

-		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);

@@ -815,13 +825,11 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +855,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
index 28273da8429..883a40a30d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,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) {

@@ -294,8 +295,7 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 		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());

 	}

 

@@ -318,12 +318,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();

@@ -447,13 +451,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;

 				}

@@ -465,7 +474,8 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +501,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();

@@ -544,8 +555,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());

 		}

@@ -562,8 +572,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());

 		}

@@ -573,13 +582,10 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +689,14 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +709,10 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	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;

 		}

@@ -722,11 +733,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 {

@@ -740,7 +753,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +765,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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java
index 64caec5e907..7c8d45f78e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure;
 /**

  * @generated

  */

-public class GeneralizationEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,8 +53,8 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {

-			((GeneralizationAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((GeneralizationAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
index ab3fff10d58..bfb6db9d47d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 15));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 15));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 		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,8 +295,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 		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());

 	}

 

@@ -318,12 +318,15 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 					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(), InformationFlowAppliedStereotypeEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														InformationFlowAppliedStereotypeEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -447,13 +450,18 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 					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;

 				}

@@ -465,7 +473,8 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +500,10 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 				@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();

@@ -544,8 +554,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 * @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());

 		}

@@ -562,8 +571,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 * @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());

 		}

@@ -573,13 +581,10 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +688,14 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +708,10 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	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;

 		}

@@ -722,11 +732,13 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 				@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 {

@@ -740,7 +752,6 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +764,10 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
index 5848e39085f..ebec6377163 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -124,12 +125,14 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID), new Point(0, 30));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID),

+				new Point(0, 30));

 	}

 

 	/**

@@ -148,7 +151,8 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new InformationFlowCustomLabelEditPolicy());

+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY,

+				new InformationFlowCustomLabelEditPolicy());

 	}

 

 	/**

@@ -158,7 +162,6 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -265,8 +268,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 		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) {

@@ -297,8 +299,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 		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());

 	}

 

@@ -321,12 +322,16 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 					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(), InformationFlowConveyedLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																InformationFlowConveyedLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -450,13 +455,18 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 					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;

 				}

@@ -468,7 +478,8 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -494,9 +505,10 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 				@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();

@@ -547,8 +559,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -565,8 +576,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -576,13 +586,10 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -694,11 +701,14 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 */

 	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);

 			}

 		}

 	}

@@ -711,8 +721,10 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	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;

 		}

@@ -733,11 +745,13 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 				@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 {

@@ -751,7 +765,6 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -764,10 +777,10 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java
index ff758b056e3..e1b93ef6ebc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationFlowF
 /**

  * @generated

  */

-public class InformationFlowEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class InformationFlowEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,16 +53,14 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof InformationFlowConveyedLabelEditPart) {

-			((InformationFlowConveyedLabelEditPart) childEditPart).setLabel(

-					getPrimaryShape().getConveyedLabel());

+			((InformationFlowConveyedLabelEditPart) childEditPart).setLabel(getPrimaryShape().getConveyedLabel());

 		}

 		if (childEditPart instanceof InformationFlowAppliedStereotypeEditPart) {

-			((InformationFlowAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((InformationFlowAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		if (childEditPart instanceof InformationFlowNameEditPart) {

-			((InformationFlowNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+			((InformationFlowNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowNameEditPart.java
index 81309c5bf6d..8b1bca9ccbd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowNameEditPart.java
@@ -1,819 +1,819 @@
-/**
- * Copyright (c) 2014 CEA LIST.
-  * 
-  * All rights reserved. This program and the accompanying materials
-  * are made available under the terms of the Eclipse Public License v1.0
-  * which accompanies this distribution, and is available at
-  * http://www.eclipse.org/legal/epl-v10.html
-  * 
-  * Contributors:
-  *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InformationFlowNameEditPart extends PapyrusLabelEditPart
-		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {
-
-	/**
-	 * @generated
-	 */
-	public static final String VISUAL_ID = "InformationFlow_NameLabel";
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * 
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 * 
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(
-				UMLVisualIDRegistry.getType(
-						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowNameEditPart.VISUAL_ID),
-				new Point(0, 40));
-	}
-
-	/**
-	 * @generated
-	 */
-	public InformationFlowNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated Papyrus Generation
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {
-
-									@Override
-									public void run() {
-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(
-												getParserElement(), InformationFlowNameEditPart.this), (String) value));
-									}
-								});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserUtil.getParser(UMLElementTypes.InformationFlow_Edge, getParserElement(), this, VISUAL_ID);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-
-			@Override
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)
-							.createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
-							configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(),
-									((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * 
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),
-						this);
-			} else {
-				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);
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * 
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData()
-								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData()
-									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getLabelRole() {
-		return "Name";//$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getIconPathRole() {
-		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$
-	}
-
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+  * 

+  * All rights reserved. This program and the accompanying materials

+  * are made available under the terms of the Eclipse Public License v1.0

+  * which accompanies this distribution, and is available at

+  * http://www.eclipse.org/legal/epl-v10.html

+  * 

+  * Contributors:

+  *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InformationFlowNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String VISUAL_ID = "InformationFlow_NameLabel";

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowNameEditPart.VISUAL_ID),

+				new Point(0, 40));

+	}

+

+	/**

+	 * @generated

+	 */

+	public InformationFlowNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated Papyrus Generation

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else if (figure instanceof ILabelFigure) {

+			return ((ILabelFigure) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else if (figure instanceof ILabelFigure) {

+			((ILabelFigure) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this),

+					getParserOptions().intValue());

+		}

+		if (text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+									@Override

+									public void run() {

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), InformationFlowNameEditPart.this), (String) value));

+									}

+								});

+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ParserUtil.getParser(UMLElementTypes.InformationFlow_Edge, getParserElement(), this, VISUAL_ID);

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager) getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if (configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration)

+							.createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(

+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),

+							configuration.getTextToEdit(resolveSemanticElement()), configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if (Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (request.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) request.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if (resolveSemanticElement() instanceof Feature) {

+			if (((Feature) resolveSemanticElement()).isStatic()) {

+				((WrappingLabel) getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel) getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

+			for (int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

+			for (int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+					IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if (languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(),

+						this);

+			} else {

+				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);

+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *            the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					if (isActive() && isEditable()) {

+						if (theRequest.getExtendedData()

+								.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character) theRequest.getExtendedData()

+									.get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if ((theRequest instanceof DirectEditRequest)

+								&& (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer) event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser) getParser();

+				if (modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getLabelRole() {

+		return "Name";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getIconPathRole() {

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+	}

+

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
index 530aaacf111..c24f23ca67f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
@@ -90,7 +90,8 @@ public class InformationItemEditPart 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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -141,7 +142,6 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -155,8 +155,7 @@ public class InformationItemEditPart 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;

 				}

@@ -166,7 +165,6 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -192,7 +190,6 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -256,7 +253,6 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -306,7 +302,6 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -330,8 +325,4 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
index bf52b811dbc..a8de7ef890e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
@@ -90,7 +90,8 @@ public class InformationItemEditPartCN 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(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -141,7 +142,6 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -155,8 +155,7 @@ public class InformationItemEditPartCN 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;

 				}

@@ -166,7 +165,6 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -192,7 +190,6 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -256,7 +253,6 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -306,7 +302,6 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -330,8 +325,4 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPart.java
index b8e2ec5168b..c7bc116e079 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InformationItemFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class InformationItemFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class InformationItemFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class InformationItemFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class InformationItemFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class InformationItemFloatingLabelEditPart extends
 					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(), InformationItemFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																InformationItemFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class InformationItemFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class InformationItemFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class InformationItemFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class InformationItemFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class InformationItemFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class InformationItemFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class InformationItemFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class InformationItemFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class InformationItemFloatingLabelEditPart extends
 				@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 +777,6 @@ public class InformationItemFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class InformationItemFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPartCN.java
index 749ab2d62a4..9c9a3225bae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InformationItemFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class InformationItemFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class InformationItemFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class InformationItemFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class InformationItemFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class InformationItemFloatingLabelEditPartCN extends
 					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(), InformationItemFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																InformationItemFloatingLabelEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -378,7 +380,8 @@ public class InformationItemFloatingLabelEditPartCN extends
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.InformationItem_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.InformationItem_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -465,13 +468,18 @@ public class InformationItemFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +491,8 @@ public class InformationItemFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +518,10 @@ public class InformationItemFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +572,7 @@ public class InformationItemFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +589,7 @@ public class InformationItemFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +599,10 @@ public class InformationItemFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +714,14 @@ public class InformationItemFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +734,10 @@ public class InformationItemFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +758,13 @@ public class InformationItemFloatingLabelEditPartCN extends
 				@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 +778,6 @@ public class InformationItemFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +790,10 @@ public class InformationItemFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java
index 67c7ac5742a..9ff20952d0c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InformationItemNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class InformationItemNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 		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) {

@@ -290,8 +288,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InformationItemNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), InformationItemNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 					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;

 				}

@@ -461,7 +464,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 				@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();

@@ -546,8 +551,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	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;

 		}

@@ -732,11 +737,13 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 				@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 {

@@ -750,7 +757,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java
index 277f0e3dd76..60000a31b2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 		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) {

@@ -290,8 +288,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InformationItemNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														InformationItemNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +355,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.InformationItem_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.InformationItem_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +443,18 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 					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;

 				}

@@ -461,7 +466,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +493,10 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 				@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();

@@ -546,8 +553,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +570,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +580,10 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +695,14 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +715,10 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	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;

 		}

@@ -732,11 +739,13 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 				@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 {

@@ -750,7 +759,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +775,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +788,10 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +808,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 				}

 			}

 		}

-		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);

@@ -815,13 +823,11 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +853,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
index e1e4fd3a400..9f5aad5810c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
@@ -89,7 +89,8 @@ public class InstanceValueEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class InstanceValueEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceValueNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueFloatingLabelEditPart.java
index 1043c6556a6..a760b17c474 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InstanceValueFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class InstanceValueFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InstanceValueFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InstanceValueFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class InstanceValueFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class InstanceValueFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class InstanceValueFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class InstanceValueFloatingLabelEditPart extends
 					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(), InstanceValueFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																InstanceValueFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class InstanceValueFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class InstanceValueFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class InstanceValueFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class InstanceValueFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class InstanceValueFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class InstanceValueFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class InstanceValueFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class InstanceValueFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class InstanceValueFloatingLabelEditPart extends
 				@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 +777,6 @@ public class InstanceValueFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class InstanceValueFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java
index f66cf437300..49244a3998c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 		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) {

@@ -290,8 +288,7 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InstanceValueNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), InstanceValueNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 					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;

 				}

@@ -461,7 +464,8 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 				@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();

@@ -546,8 +551,7 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	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;

 		}

@@ -732,11 +737,13 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 				@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 {

@@ -750,7 +757,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
index 106d2d5e1bc..eccdf8d7256 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class InteractionCompositeCompartmentEditPart

-		extends LinkLFShapeCompartmentEditPart {

+public class InteractionCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class InteractionCompositeCompartmentEditPart
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class InteractionCompositeCompartmentEditPart
 		return Messages.InteractionCompositeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class InteractionCompositeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class InteractionCompositeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
index 01fd6baa78d..15912aa3ffb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class InteractionCompositeCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class InteractionCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class InteractionCompositeCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class InteractionCompositeCompartmentEditPartCN
 		return Messages.InteractionCompositeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class InteractionCompositeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class InteractionCompositeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
index 6607f25a1c9..39d440cd9fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
@@ -104,11 +104,15 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());

@@ -163,7 +167,6 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -177,8 +180,7 @@ public class InteractionCompositeEditPart 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;

 				}

@@ -188,7 +190,6 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -214,34 +215,27 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof InteractionCompositeCompartmentEditPart) {

 			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(((InteractionCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -321,7 +315,6 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -371,7 +364,6 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -395,8 +387,4 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionCompositeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
index 6a8e53f8c3a..6f9b65ec3d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
@@ -103,11 +103,15 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -161,7 +165,6 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -175,8 +178,7 @@ public class InteractionCompositeEditPartCN 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;

 				}

@@ -186,7 +188,6 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -212,34 +213,27 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof InteractionCompositeCompartmentEditPartCN) {

 			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(((InteractionCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -319,7 +313,6 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -369,7 +362,6 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -393,8 +385,4 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionCompositeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPart.java
index 4e42991b4e4..992c2e87642 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InteractionCompositeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class InteractionCompositeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class InteractionCompositeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class InteractionCompositeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class InteractionCompositeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class InteractionCompositeFloatingLabelEditPart extends
 					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(), InteractionCompositeFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														InteractionCompositeFloatingLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +466,18 @@ public class InteractionCompositeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +489,8 @@ public class InteractionCompositeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +516,10 @@ public class InteractionCompositeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +570,7 @@ public class InteractionCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +587,7 @@ public class InteractionCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +597,10 @@ public class InteractionCompositeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +712,14 @@ public class InteractionCompositeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +732,10 @@ public class InteractionCompositeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +756,13 @@ public class InteractionCompositeFloatingLabelEditPart extends
 				@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 +776,6 @@ public class InteractionCompositeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +788,10 @@ public class InteractionCompositeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPartCN.java
index df84fa38cee..45281189ac8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InteractionCompositeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 					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(), InteractionCompositeFloatingLabelEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														InteractionCompositeFloatingLabelEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +466,18 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +489,8 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +516,10 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +570,7 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +587,7 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +597,10 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +712,14 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +732,10 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +756,13 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 				@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 +776,6 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +788,10 @@ public class InteractionCompositeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java
index 4edb8201619..4dd6839f5b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class InteractionCompositeNameEditPart 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) {

@@ -290,8 +288,7 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InteractionCompositeNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																InteractionCompositeNameEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +444,18 @@ public class InteractionCompositeNameEditPart 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;

 				}

@@ -461,7 +467,8 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class InteractionCompositeNameEditPart 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();

@@ -546,8 +554,7 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	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;

 		}

@@ -732,11 +740,13 @@ public class InteractionCompositeNameEditPart 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 {

@@ -750,7 +760,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class InteractionCompositeNameEditPart 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);

@@ -815,13 +824,11 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java
index c01a52dd663..2d181a484d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class InteractionCompositeNameEditPartCN 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) {

@@ -290,8 +288,7 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InteractionCompositeNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																InteractionCompositeNameEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +444,18 @@ public class InteractionCompositeNameEditPartCN 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;

 				}

@@ -461,7 +467,8 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class InteractionCompositeNameEditPartCN 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();

@@ -546,8 +554,7 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	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;

 		}

@@ -732,11 +740,13 @@ public class InteractionCompositeNameEditPartCN 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 {

@@ -750,7 +760,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 				}

 			}

 		}

-		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);

@@ -815,13 +824,11 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
index f4ae5ef2134..135497b1a41 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
@@ -74,7 +74,8 @@ public class InteractionConstraintEditPart 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());

 		// 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);

 	}

@@ -107,7 +108,6 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -118,7 +118,6 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -144,11 +143,11 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 			return true;

 		}

 		if (childEditPart instanceof InteractionConstraintSpecificationEditPart) {

-			((InteractionConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			((InteractionConstraintSpecificationEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -192,7 +191,6 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 		return getContentPane();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -201,7 +199,6 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -251,7 +248,6 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -275,8 +271,4 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionConstraintNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
index 4a7b0b6446a..3f85b3e1d8e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
@@ -74,7 +74,8 @@ public class InteractionConstraintEditPartCN 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());

 		// 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);

 	}

@@ -107,7 +108,6 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -118,7 +118,6 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -144,11 +143,11 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 			return true;

 		}

 		if (childEditPart instanceof InteractionConstraintSpecificationEditPartCN) {

-			((InteractionConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			((InteractionConstraintSpecificationEditPartCN) childEditPart)

+					.setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -192,7 +191,6 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 		return getContentPane();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -201,7 +199,6 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -251,7 +248,6 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -275,8 +271,4 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionConstraintNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java
index 97fca74c56d..6ef62d657d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class InteractionConstraintNameEditPart 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) {

@@ -290,8 +288,7 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InteractionConstraintNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																InteractionConstraintNameEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +357,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.InteractionConstraint_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.InteractionConstraint_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +445,18 @@ public class InteractionConstraintNameEditPart 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;

 				}

@@ -461,7 +468,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +495,10 @@ public class InteractionConstraintNameEditPart 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();

@@ -546,8 +555,7 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +572,7 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +582,10 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +697,14 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +717,10 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	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;

 		}

@@ -732,11 +741,13 @@ public class InteractionConstraintNameEditPart 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 {

@@ -750,7 +761,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +777,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +790,10 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +810,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 				}

 			}

 		}

-		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);

@@ -815,13 +825,11 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +855,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java
index 9061a78b94d..11aacc2ae95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class InteractionConstraintNameEditPartCN 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) {

@@ -290,8 +288,7 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InteractionConstraintNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																InteractionConstraintNameEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +357,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.InteractionConstraint_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.InteractionConstraint_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +445,18 @@ public class InteractionConstraintNameEditPartCN 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;

 				}

@@ -461,7 +468,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +495,10 @@ public class InteractionConstraintNameEditPartCN 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();

@@ -546,8 +555,7 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +572,7 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +582,10 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +697,14 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +717,10 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	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;

 		}

@@ -732,11 +741,13 @@ public class InteractionConstraintNameEditPartCN 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 {

@@ -750,7 +761,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +777,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +790,10 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +810,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 				}

 			}

 		}

-		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);

@@ -815,13 +825,11 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +855,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java
index e532a91c136..f55764eac27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java
@@ -79,7 +79,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InteractionConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class InteractionConstraintSpecificationEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -120,7 +121,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -138,7 +138,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -244,8 +243,7 @@ public class InteractionConstraintSpecificationEditPart 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) {

@@ -276,8 +274,7 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 		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());

 	}

 

@@ -300,12 +297,15 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InteractionConstraintSpecificationEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														InteractionConstraintSpecificationEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -342,7 +342,8 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.InteractionConstraint_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.InteractionConstraint_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -429,13 +430,18 @@ public class InteractionConstraintSpecificationEditPart 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;

 				}

@@ -447,7 +453,8 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -473,9 +480,10 @@ public class InteractionConstraintSpecificationEditPart 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();

@@ -532,8 +540,7 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -550,8 +557,7 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -561,13 +567,10 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -679,11 +682,14 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 */

 	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);

 			}

 		}

 	}

@@ -696,8 +702,10 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	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;

 		}

@@ -718,11 +726,13 @@ public class InteractionConstraintSpecificationEditPart 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 {

@@ -736,7 +746,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,7 +762,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,10 +775,10 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -798,13 +806,11 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -830,7 +836,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java
index cb4a1f7d0f9..4ce96fe19df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java
@@ -79,7 +79,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -120,7 +121,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -138,7 +138,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -244,8 +243,7 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 		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,8 +274,7 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 		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());

 	}

 

@@ -300,12 +297,15 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InteractionConstraintSpecificationEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														InteractionConstraintSpecificationEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -342,7 +342,8 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.InteractionConstraint_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.InteractionConstraint_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -429,13 +430,18 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 					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;

 				}

@@ -447,7 +453,8 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -473,9 +480,10 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 				@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();

@@ -532,8 +540,7 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -550,8 +557,7 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -561,13 +567,10 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -679,11 +682,14 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 */

 	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);

 			}

 		}

 	}

@@ -696,8 +702,10 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	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;

 		}

@@ -718,11 +726,13 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 				@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 {

@@ -736,7 +746,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,7 +762,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,10 +775,10 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -798,13 +806,11 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -830,7 +836,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
index 3a37c523bce..aaa88d91f4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
@@ -91,9 +91,12 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -143,7 +146,6 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -157,8 +159,7 @@ public class InterfaceEditPart 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;

 				}

@@ -168,7 +169,6 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -194,7 +194,6 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -258,7 +257,6 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -308,7 +306,6 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -332,8 +329,4 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
index 7fa789603da..a8ac46cd39b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
@@ -91,9 +91,12 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -143,7 +146,6 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -157,8 +159,7 @@ public class InterfaceEditPartCN 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;

 				}

@@ -168,7 +169,6 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -194,7 +194,6 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -258,7 +257,6 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -308,7 +306,6 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -332,8 +329,4 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPart.java
index 16ba35bcdff..e25815fa6b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InterfaceFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class InterfaceFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class InterfaceFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class InterfaceFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class InterfaceFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class InterfaceFloatingLabelEditPart extends
 					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(), InterfaceFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														InterfaceFloatingLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +465,18 @@ public class InterfaceFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class InterfaceFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class InterfaceFloatingLabelEditPart extends
 				@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();

@@ -562,8 +569,7 @@ public class InterfaceFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class InterfaceFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class InterfaceFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class InterfaceFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class InterfaceFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class InterfaceFloatingLabelEditPart extends
 				@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 +775,6 @@ public class InterfaceFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class InterfaceFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPartCN.java
index 6f62529f105..468a3853bad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InterfaceFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class InterfaceFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class InterfaceFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class InterfaceFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class InterfaceFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class InterfaceFloatingLabelEditPartCN extends
 					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(), InterfaceFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																InterfaceFloatingLabelEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class InterfaceFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class InterfaceFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class InterfaceFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class InterfaceFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class InterfaceFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class InterfaceFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class InterfaceFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class InterfaceFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class InterfaceFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class InterfaceFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class InterfaceFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java
index 17db65cd170..bd0648c84ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class InterfaceNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 		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) {

@@ -290,8 +288,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InterfaceNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), InterfaceNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 					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;

 				}

@@ -461,7 +464,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 				@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();

@@ -546,8 +551,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	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;

 		}

@@ -732,11 +737,13 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 				@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 {

@@ -750,7 +757,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java
index 2684f928ab5..25661d6e5b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 		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) {

@@ -290,8 +288,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InterfaceNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), InterfaceNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 					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;

 				}

@@ -461,7 +464,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 				@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();

@@ -546,8 +551,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	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;

 		}

@@ -732,11 +737,13 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 				@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 {

@@ -750,7 +757,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
index 300f18991ae..8cce87953cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 		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,8 +295,7 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 		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());

 	}

 

@@ -318,12 +318,15 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 					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(), InterfaceRealizationAppliedStereotypeEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														InterfaceRealizationAppliedStereotypeEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -360,7 +363,8 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.InterfaceRealization_Edge, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.InterfaceRealization_Edge, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -447,13 +451,18 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 					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;

 				}

@@ -465,7 +474,8 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +501,10 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 				@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();

@@ -544,8 +555,7 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @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());

 		}

@@ -562,8 +572,7 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @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());

 		}

@@ -573,13 +582,10 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +689,14 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +709,10 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	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;

 		}

@@ -722,11 +733,13 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 				@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 {

@@ -740,7 +753,6 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +765,10 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java
index a673d530d12..ed7ce9322b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFi
 /**

  * @generated

  */

-public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,12 +53,11 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof InterfaceRealizationNameEditPart) {

-			((InterfaceRealizationNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+			((InterfaceRealizationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {

-			((InterfaceRealizationAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((InterfaceRealizationAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
index 7ecdd9fa5df..70d1ae29b5b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 		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,8 +295,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 		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());

 	}

 

@@ -318,12 +318,16 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 					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(), InterfaceRealizationNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																InterfaceRealizationNameEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -360,7 +364,8 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.InterfaceRealization_Edge, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.InterfaceRealization_Edge, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -447,13 +452,18 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 					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;

 				}

@@ -465,7 +475,8 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +502,10 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 				@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();

@@ -544,8 +556,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +573,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +583,10 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -691,11 +698,14 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 */

 	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);

 			}

 		}

 	}

@@ -708,8 +718,10 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	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;

 		}

@@ -730,11 +742,13 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 				@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 {

@@ -748,7 +762,6 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -761,10 +774,10 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
index 5e8ac7f5c07..87ce6a704a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
@@ -74,7 +74,8 @@ public class IntervalConstraintEditPart 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());

 		// 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);

 	}

@@ -107,7 +108,6 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -118,7 +118,6 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -148,7 +147,6 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -192,7 +190,6 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 		return getContentPane();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -201,7 +198,6 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -251,7 +247,6 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -275,8 +270,4 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(IntervalConstraintNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
index d509b0b2923..2ce5976a468 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
@@ -74,7 +74,8 @@ public class IntervalConstraintEditPartCN 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());

 		// 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);

 	}

@@ -107,7 +108,6 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -118,7 +118,6 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -144,11 +143,11 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 			return true;

 		}

 		if (childEditPart instanceof IntervalConstraintSpecificationEditPartCN) {

-			((IntervalConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			((IntervalConstraintSpecificationEditPartCN) childEditPart)

+					.setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -192,7 +191,6 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 		return getContentPane();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -201,7 +199,6 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -251,7 +248,6 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -275,8 +271,4 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(IntervalConstraintNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java
index 6c365462bf5..79adc8c4582 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		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) {

@@ -290,8 +288,7 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), IntervalConstraintNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														IntervalConstraintNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +355,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.IntervalConstraint_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.IntervalConstraint_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +443,18 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 					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;

 				}

@@ -461,7 +466,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +493,10 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 				@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();

@@ -546,8 +553,7 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +570,7 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +580,10 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +695,14 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +715,10 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	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;

 		}

@@ -732,11 +739,13 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 				@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 {

@@ -750,7 +759,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +775,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +788,10 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +808,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 				}

 			}

 		}

-		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);

@@ -815,13 +823,11 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +853,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java
index bdec654e396..b0d74b13ed6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class IntervalConstraintNameEditPartCN 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) {

@@ -290,8 +288,7 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), IntervalConstraintNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																IntervalConstraintNameEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +357,8 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.IntervalConstraint_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.IntervalConstraint_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +445,18 @@ public class IntervalConstraintNameEditPartCN 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;

 				}

@@ -461,7 +468,8 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +495,10 @@ public class IntervalConstraintNameEditPartCN 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();

@@ -546,8 +555,7 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +572,7 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +582,10 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +697,14 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +717,10 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	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;

 		}

@@ -732,11 +741,13 @@ public class IntervalConstraintNameEditPartCN 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 {

@@ -750,7 +761,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +777,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +790,10 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +810,8 @@ public class IntervalConstraintNameEditPartCN 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);

@@ -815,13 +825,11 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +855,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java
index 2d464ca01dd..d65fcb87ece 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java
@@ -79,7 +79,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -120,7 +121,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -138,7 +138,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -244,8 +243,7 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 		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,8 +274,7 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 		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());

 	}

 

@@ -300,12 +297,16 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), IntervalConstraintSpecificationEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																IntervalConstraintSpecificationEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -342,7 +343,8 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.IntervalConstraint_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.IntervalConstraint_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -429,13 +431,18 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 					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;

 				}

@@ -447,7 +454,8 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -473,9 +481,10 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 				@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();

@@ -532,8 +541,7 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -550,8 +558,7 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -561,13 +568,10 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -679,11 +683,14 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	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);

 			}

 		}

 	}

@@ -696,8 +703,10 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	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;

 		}

@@ -718,11 +727,13 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 				@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 {

@@ -736,7 +747,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,7 +763,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,10 +776,10 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -798,13 +807,11 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -830,7 +837,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java
index eb4054dfe12..d45c0f43e7a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java
@@ -79,7 +79,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -120,7 +121,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -138,7 +138,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -244,8 +243,7 @@ public class IntervalConstraintSpecificationEditPartCN 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) {

@@ -276,8 +274,7 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		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());

 	}

 

@@ -300,12 +297,15 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), IntervalConstraintSpecificationEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														IntervalConstraintSpecificationEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -342,7 +342,8 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.IntervalConstraint_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.IntervalConstraint_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -429,13 +430,18 @@ public class IntervalConstraintSpecificationEditPartCN 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;

 				}

@@ -447,7 +453,8 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -473,9 +480,10 @@ public class IntervalConstraintSpecificationEditPartCN 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();

@@ -532,8 +540,7 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -550,8 +557,7 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -561,13 +567,10 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -679,11 +682,14 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	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);

 			}

 		}

 	}

@@ -696,8 +702,10 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	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;

 		}

@@ -718,11 +726,13 @@ public class IntervalConstraintSpecificationEditPartCN 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 {

@@ -736,7 +746,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,7 +762,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,10 +775,10 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -798,13 +806,11 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -830,7 +836,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
index 803f766a129..31f60dbf874 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
@@ -89,7 +89,8 @@ public class IntervalEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class IntervalEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(IntervalNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalFloatingLabelEditPart.java
index e3925df682c..78eed0ed41e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class IntervalFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class IntervalFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class IntervalFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class IntervalFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class IntervalFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class IntervalFloatingLabelEditPart extends
 					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(), IntervalFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														IntervalFloatingLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +465,18 @@ public class IntervalFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class IntervalFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class IntervalFloatingLabelEditPart extends
 				@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();

@@ -562,8 +569,7 @@ public class IntervalFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class IntervalFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class IntervalFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class IntervalFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class IntervalFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class IntervalFloatingLabelEditPart extends
 				@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 +775,6 @@ public class IntervalFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class IntervalFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java
index b4f27de1031..0dd8e1af4f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class IntervalNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 		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) {

@@ -290,8 +288,7 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), IntervalNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), IntervalNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 					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;

 				}

@@ -461,7 +464,8 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 				@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();

@@ -546,8 +551,7 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	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;

 		}

@@ -732,11 +737,13 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 				@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 {

@@ -750,7 +757,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LinkDescriptorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LinkDescriptorEditPart.java
index 1453b9001fe..03852736a8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LinkDescriptorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LinkDescriptorEditPart.java
@@ -23,8 +23,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure
 /**

  * @generated

  */

-public class LinkDescriptorEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart {

+public class LinkDescriptorEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -47,10 +46,6 @@ public class LinkDescriptorEditPart extends ConnectionEditPart
 		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);

 	}

 

-

-

-

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
index e3013dfc486..ba95ee9afac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
@@ -89,7 +89,8 @@ public class LiteralBooleanEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class LiteralBooleanEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralBooleanNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanFloatingLabelEditPart.java
index 4f278139955..7d0b67e57a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralBooleanFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class LiteralBooleanFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralBooleanFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralBooleanFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class LiteralBooleanFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class LiteralBooleanFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class LiteralBooleanFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class LiteralBooleanFloatingLabelEditPart extends
 					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(), LiteralBooleanFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																LiteralBooleanFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class LiteralBooleanFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class LiteralBooleanFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class LiteralBooleanFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class LiteralBooleanFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class LiteralBooleanFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class LiteralBooleanFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class LiteralBooleanFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class LiteralBooleanFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class LiteralBooleanFloatingLabelEditPart extends
 				@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 +777,6 @@ public class LiteralBooleanFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class LiteralBooleanFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java
index 2a107fdc159..4e913627cd2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 		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) {

@@ -290,8 +288,7 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), LiteralBooleanNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), LiteralBooleanNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 					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;

 				}

@@ -461,7 +464,8 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 				@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();

@@ -546,8 +551,7 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	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;

 		}

@@ -732,11 +737,13 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 				@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 {

@@ -750,7 +757,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
index ffb3e315ae3..0ad28b3fb87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
@@ -89,7 +89,8 @@ public class LiteralIntegerEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class LiteralIntegerEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralIntegerNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerFloatingLabelEditPart.java
index f7c292d706b..48a03855429 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralIntegerFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class LiteralIntegerFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralIntegerFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralIntegerFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class LiteralIntegerFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class LiteralIntegerFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class LiteralIntegerFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class LiteralIntegerFloatingLabelEditPart extends
 					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(), LiteralIntegerFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																LiteralIntegerFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class LiteralIntegerFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class LiteralIntegerFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class LiteralIntegerFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class LiteralIntegerFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class LiteralIntegerFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class LiteralIntegerFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class LiteralIntegerFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class LiteralIntegerFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class LiteralIntegerFloatingLabelEditPart extends
 				@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 +777,6 @@ public class LiteralIntegerFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class LiteralIntegerFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java
index 3b6e82e88bf..57ced4273c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 		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) {

@@ -290,8 +288,7 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), LiteralIntegerNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), LiteralIntegerNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 					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;

 				}

@@ -461,7 +464,8 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 				@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();

@@ -546,8 +551,7 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	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;

 		}

@@ -732,11 +737,13 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 				@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 {

@@ -750,7 +757,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
index 2ca8eb3dddf..e62a2daeab7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
@@ -89,7 +89,8 @@ public class LiteralNullEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class LiteralNullEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralNullNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullFloatingLabelEditPart.java
index 1fb949df7a8..cb29ea0f03c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralNullFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class LiteralNullFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralNullFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralNullFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class LiteralNullFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class LiteralNullFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class LiteralNullFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class LiteralNullFloatingLabelEditPart extends
 					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(), LiteralNullFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																LiteralNullFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class LiteralNullFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class LiteralNullFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class LiteralNullFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class LiteralNullFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class LiteralNullFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class LiteralNullFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class LiteralNullFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class LiteralNullFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class LiteralNullFloatingLabelEditPart extends
 				@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 +777,6 @@ public class LiteralNullFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class LiteralNullFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java
index d34e4fac063..27b8b80ac44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 		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) {

@@ -290,8 +288,7 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), LiteralNullNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), LiteralNullNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 					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;

 				}

@@ -461,7 +464,8 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 				@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();

@@ -546,8 +551,7 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	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;

 		}

@@ -732,11 +737,13 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 				@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 {

@@ -750,7 +757,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
index 76866e6794e..323c542d6e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
@@ -89,7 +89,8 @@ public class LiteralStringEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class LiteralStringEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralStringNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringFloatingLabelEditPart.java
index 604eb6eb688..5fd4bf11e5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralStringFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class LiteralStringFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralStringFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralStringFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class LiteralStringFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class LiteralStringFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class LiteralStringFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class LiteralStringFloatingLabelEditPart extends
 					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(), LiteralStringFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																LiteralStringFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class LiteralStringFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class LiteralStringFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class LiteralStringFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class LiteralStringFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class LiteralStringFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class LiteralStringFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class LiteralStringFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class LiteralStringFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class LiteralStringFloatingLabelEditPart extends
 				@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 +777,6 @@ public class LiteralStringFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class LiteralStringFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java
index 6f3c5663146..d03c187b650 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 		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) {

@@ -290,8 +288,7 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), LiteralStringNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), LiteralStringNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 					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;

 				}

@@ -461,7 +464,8 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 				@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();

@@ -546,8 +551,7 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	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;

 		}

@@ -732,11 +737,13 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 				@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 {

@@ -750,7 +757,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
index a9b710eddc6..03b4e8729e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
@@ -89,7 +89,8 @@ public class LiteralUnlimitedNaturalEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class LiteralUnlimitedNaturalEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalFloatingLabelEditPart.java
index 2ec5de32755..83b826cb8c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralUnlimitedNaturalFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralUnlimitedNaturalFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralUnlimitedNaturalFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 					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(), LiteralUnlimitedNaturalFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														LiteralUnlimitedNaturalFloatingLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -378,7 +379,8 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.LiteralUnlimitedNatural_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.LiteralUnlimitedNatural_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -465,13 +467,18 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 				@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 +777,6 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java
index 6f3ebb5fab6..fc561812ca8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class LiteralUnlimitedNaturalNameEditPart 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) {

@@ -290,8 +288,7 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), LiteralUnlimitedNaturalNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																LiteralUnlimitedNaturalNameEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +357,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.LiteralUnlimitedNatural_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.LiteralUnlimitedNatural_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +445,18 @@ public class LiteralUnlimitedNaturalNameEditPart 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;

 				}

@@ -461,7 +468,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +495,10 @@ public class LiteralUnlimitedNaturalNameEditPart 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();

@@ -546,8 +555,7 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +572,7 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +582,10 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +697,14 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +717,10 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	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;

 		}

@@ -732,11 +741,13 @@ public class LiteralUnlimitedNaturalNameEditPart 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 {

@@ -750,7 +761,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +777,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +790,10 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +810,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 				}

 			}

 		}

-		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);

@@ -815,13 +825,11 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +855,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
index 77c0db44759..b0aa5981d7a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,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) {

@@ -294,8 +295,7 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		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());

 	}

 

@@ -318,12 +318,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();

@@ -447,13 +451,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;

 				}

@@ -465,7 +474,8 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +501,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();

@@ -544,8 +555,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());

 		}

@@ -562,8 +572,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());

 		}

@@ -573,13 +582,10 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +689,14 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +709,10 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	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;

 		}

@@ -722,11 +733,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 {

@@ -740,7 +753,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +765,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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java
index fee7b3c8bc2..15cbfc2d105 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
 /**

  * @generated

  */

-public class ManifestationEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class ManifestationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,12 +53,11 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof ManifestationNameEditPart) {

-			((ManifestationNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+			((ManifestationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof ManifestationAppliedStereotypeEditPart) {

-			((ManifestationAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((ManifestationAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
index 19c58f36828..a93c2dbf56c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ManifestationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class ManifestationNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationNameEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 		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,8 +295,7 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 		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());

 	}

 

@@ -318,12 +318,13 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 					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();

@@ -447,13 +448,18 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 					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;

 				}

@@ -465,7 +471,8 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +498,10 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 				@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();

@@ -544,8 +552,7 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +569,7 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +579,10 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -691,11 +694,14 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 */

 	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);

 			}

 		}

 	}

@@ -708,8 +714,10 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	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;

 		}

@@ -730,11 +738,13 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 				@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 {

@@ -748,7 +758,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -761,10 +770,10 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
index 3dda12d8f0e..229820e0279 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class NodeCompositeCompartmentEditPart

-		extends LinkLFShapeCompartmentEditPart {

+public class NodeCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class NodeCompositeCompartmentEditPart
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class NodeCompositeCompartmentEditPart
 		return Messages.NodeCompositeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class NodeCompositeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class NodeCompositeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
index 81ba7e38cd3..e4502ee1d3b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class NodeCompositeCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class NodeCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class NodeCompositeCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class NodeCompositeCompartmentEditPartCN
 		return Messages.NodeCompositeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class NodeCompositeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class NodeCompositeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
index 1bbcd8a66b1..18a98ccfe67 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
@@ -103,11 +103,15 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -160,7 +164,6 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -174,8 +177,7 @@ public class NodeCompositeEditPart 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;

 				}

@@ -185,7 +187,6 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -211,24 +212,20 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 			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;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -304,7 +301,6 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -354,7 +350,6 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -378,8 +373,4 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NodeCompositeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
index 0b3ab32e08e..610da11a19d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
@@ -103,11 +103,15 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -160,7 +164,6 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -174,8 +177,7 @@ public class NodeCompositeEditPartCN 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;

 				}

@@ -185,7 +187,6 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -211,24 +212,20 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 			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;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -304,7 +301,6 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -354,7 +350,6 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -378,8 +373,4 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NodeCompositeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPart.java
index e162aa35fb1..e919d46a079 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class NodeCompositeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class NodeCompositeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class NodeCompositeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class NodeCompositeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class NodeCompositeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class NodeCompositeFloatingLabelEditPart extends
 					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(), NodeCompositeFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																NodeCompositeFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class NodeCompositeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class NodeCompositeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class NodeCompositeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class NodeCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class NodeCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class NodeCompositeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class NodeCompositeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class NodeCompositeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class NodeCompositeFloatingLabelEditPart extends
 				@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 +777,6 @@ public class NodeCompositeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class NodeCompositeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPartCN.java
index ec6de3a1f61..5d0ad0f3661 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class NodeCompositeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 					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(), NodeCompositeFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																NodeCompositeFloatingLabelEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class NodeCompositeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java
index 561ab6f5b83..4ebca3ff83e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 		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) {

@@ -290,8 +288,7 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NodeCompositeNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), NodeCompositeNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 					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;

 				}

@@ -461,7 +464,8 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 				@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();

@@ -546,8 +551,7 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	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;

 		}

@@ -732,11 +737,13 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 				@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 {

@@ -750,7 +757,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java
index bc0c23b6f9e..3892a332a2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		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) {

@@ -290,8 +288,7 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NodeCompositeNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), NodeCompositeNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 					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;

 				}

@@ -461,7 +464,8 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 				@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();

@@ -546,8 +551,7 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	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;

 		}

@@ -732,11 +737,13 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 				@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 {

@@ -750,7 +757,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
index 4aeebf39713..d49ed2849b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class OpaqueBehaviorCompositeCompartmentEditPart

-		extends LinkLFShapeCompartmentEditPart {

+public class OpaqueBehaviorCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class OpaqueBehaviorCompositeCompartmentEditPart
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class OpaqueBehaviorCompositeCompartmentEditPart
 		return Messages.OpaqueBehaviorCompositeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class OpaqueBehaviorCompositeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class OpaqueBehaviorCompositeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
index 0ac9febbf5d..1f5b936bd79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class OpaqueBehaviorCompositeCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class OpaqueBehaviorCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class OpaqueBehaviorCompositeCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class OpaqueBehaviorCompositeCompartmentEditPartCN
 		return Messages.OpaqueBehaviorCompositeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class OpaqueBehaviorCompositeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class OpaqueBehaviorCompositeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
index 6c232e685e1..fe9502768c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
@@ -103,11 +103,15 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -161,7 +165,6 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -175,8 +178,7 @@ public class OpaqueBehaviorCompositeEditPart 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;

 				}

@@ -186,7 +188,6 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -212,34 +213,27 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 			return true;

 		}

 

-

 		if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {

 			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(((OpaqueBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -319,7 +313,6 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -369,7 +362,6 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -393,8 +385,4 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
index 6e6c7c0b50c..37dcc0ba066 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
@@ -103,11 +103,15 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -161,7 +165,6 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -175,8 +178,7 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 		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;

 				}

@@ -186,7 +188,6 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -212,34 +213,27 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 			return true;

 		}

 

-

 		if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {

 			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(((OpaqueBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -319,7 +313,6 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -369,7 +362,6 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -393,8 +385,4 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPart.java
index 1b9d17a0432..7b043bd17df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class OpaqueBehaviorCompositeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 					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(), OpaqueBehaviorCompositeFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														OpaqueBehaviorCompositeFloatingLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +466,18 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +489,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +516,10 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +570,7 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +587,7 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +597,10 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +712,14 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +732,10 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +756,13 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 				@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 +776,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +788,10 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPartCN.java
index f4818e0b692..7a8877537f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 					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(), OpaqueBehaviorCompositeFloatingLabelEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														OpaqueBehaviorCompositeFloatingLabelEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +466,18 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +489,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +516,10 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +570,7 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +587,7 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +597,10 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +712,14 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +732,10 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +756,13 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 				@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 +776,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +788,10 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java
index 33757d38a8d..2bba5b65069 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class OpaqueBehaviorCompositeNameEditPart 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) {

@@ -290,8 +288,7 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), OpaqueBehaviorCompositeNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																OpaqueBehaviorCompositeNameEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +444,18 @@ public class OpaqueBehaviorCompositeNameEditPart 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;

 				}

@@ -461,7 +467,8 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class OpaqueBehaviorCompositeNameEditPart 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();

@@ -546,8 +554,7 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	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;

 		}

@@ -732,11 +740,13 @@ public class OpaqueBehaviorCompositeNameEditPart 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 {

@@ -750,7 +760,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 				}

 			}

 		}

-		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);

@@ -815,13 +824,11 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java
index ded3b3a88a2..8b01566793e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 		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) {

@@ -290,8 +288,7 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), OpaqueBehaviorCompositeNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																OpaqueBehaviorCompositeNameEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +444,18 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 					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;

 				}

@@ -461,7 +467,8 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 				@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();

@@ -546,8 +554,7 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	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;

 		}

@@ -732,11 +740,13 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 				@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 {

@@ -750,7 +760,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 				}

 			}

 		}

-		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);

@@ -815,13 +824,11 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
index 0e080153fcb..3f09b545521 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
@@ -89,7 +89,8 @@ public class OpaqueExpressionEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class OpaqueExpressionEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueExpressionNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionFloatingLabelEditPart.java
index a41afccdaec..3ac7b4c7b90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class OpaqueExpressionFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueExpressionFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueExpressionFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 					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(), OpaqueExpressionFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																OpaqueExpressionFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 				@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 +777,6 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class OpaqueExpressionFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java
index 75d3ec31289..203e1062d99 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		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) {

@@ -290,8 +288,7 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), OpaqueExpressionNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														OpaqueExpressionNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +442,18 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 					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;

 				}

@@ -461,7 +465,8 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +492,10 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 				@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();

@@ -546,8 +552,7 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +569,7 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +579,10 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +694,14 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +714,10 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	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;

 		}

@@ -732,11 +738,13 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 				@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 {

@@ -750,7 +758,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +774,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +787,10 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +807,8 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 				}

 			}

 		}

-		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);

@@ -815,13 +822,11 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +852,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java
index 75e25968f15..f4def6e716e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java
@@ -133,7 +133,6 @@ public class OperationEditPartCLN extends CompartmentEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -162,7 +161,6 @@ public class OperationEditPartCLN extends CompartmentEditPart
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -278,8 +276,7 @@ public class OperationEditPartCLN extends CompartmentEditPart
 		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) {

@@ -310,8 +307,7 @@ public class OperationEditPartCLN extends CompartmentEditPart
 		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());

 	}

 

@@ -334,12 +330,13 @@ public class OperationEditPartCLN extends CompartmentEditPart
 					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(), OperationEditPartCLN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), OperationEditPartCLN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -376,7 +373,8 @@ public class OperationEditPartCLN extends CompartmentEditPart
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.Operation_OperationLabel, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.Operation_OperationLabel, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -463,13 +461,18 @@ public class OperationEditPartCLN extends CompartmentEditPart
 					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;

 				}

@@ -481,7 +484,8 @@ public class OperationEditPartCLN extends CompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -507,9 +511,10 @@ public class OperationEditPartCLN extends CompartmentEditPart
 				@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();

@@ -566,8 +571,7 @@ public class OperationEditPartCLN extends CompartmentEditPart
 	 * @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());

 		}

@@ -584,8 +588,7 @@ public class OperationEditPartCLN extends CompartmentEditPart
 	 * @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());

 		}

@@ -595,13 +598,10 @@ public class OperationEditPartCLN extends CompartmentEditPart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -713,11 +713,14 @@ public class OperationEditPartCLN extends CompartmentEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -730,8 +733,10 @@ public class OperationEditPartCLN extends CompartmentEditPart
 	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;

 		}

@@ -752,11 +757,13 @@ public class OperationEditPartCLN extends CompartmentEditPart
 				@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 {

@@ -770,7 +777,6 @@ public class OperationEditPartCLN extends CompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -799,10 +805,10 @@ public class OperationEditPartCLN extends CompartmentEditPart
 			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 +825,8 @@ public class OperationEditPartCLN extends CompartmentEditPart
 				}

 			}

 		}

-		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();

 		}

 		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java
index 4a61988ff4f..be8fdcf4671 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java
@@ -128,12 +128,14 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -150,7 +152,8 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeExternalNodeEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

 	}

 

@@ -177,7 +180,6 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -283,8 +285,7 @@ public class ParameterAppliedStereotypeEditPart 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) {

@@ -315,8 +316,7 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		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());

 	}

 

@@ -339,12 +339,16 @@ public class ParameterAppliedStereotypeEditPart 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(), ParameterAppliedStereotypeEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																ParameterAppliedStereotypeEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -468,13 +472,18 @@ public class ParameterAppliedStereotypeEditPart 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;

 				}

@@ -486,7 +495,8 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -512,9 +522,10 @@ public class ParameterAppliedStereotypeEditPart 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();

@@ -565,8 +576,7 @@ public class ParameterAppliedStereotypeEditPart 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());

 		}

@@ -583,8 +593,7 @@ public class ParameterAppliedStereotypeEditPart 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());

 		}

@@ -594,13 +603,10 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -704,11 +710,14 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -721,8 +730,10 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	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;

 		}

@@ -743,11 +754,13 @@ public class ParameterAppliedStereotypeEditPart 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 {

@@ -761,7 +774,6 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -774,10 +786,10 @@ public class ParameterAppliedStereotypeEditPart 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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
index 3adbfb7a6f6..7292e90322c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
@@ -90,7 +90,8 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeIconlDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ParameterLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

@@ -144,7 +145,6 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -158,8 +158,7 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 		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;

 				}

@@ -169,7 +168,6 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -186,7 +184,6 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 		return (ParameterFigure) primaryShape;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -210,7 +207,6 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -260,7 +256,6 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -284,8 +279,4 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ParameterNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java
index 0e0503d5171..981cbcf769f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java
@@ -86,8 +86,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ParameterNameEditPart extends

-		FloatingLabelEditPart

+public class ParameterNameEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {

 

 	/**

@@ -129,12 +128,14 @@ public class ParameterNameEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterNameEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry

+						.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterNameEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -178,7 +179,6 @@ public class ParameterNameEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -294,8 +294,7 @@ public class ParameterNameEditPart extends
 		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) {

@@ -326,8 +325,7 @@ public class ParameterNameEditPart extends
 		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());

 	}

 

@@ -350,12 +348,13 @@ public class ParameterNameEditPart extends
 					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(), ParameterNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), ParameterNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -479,13 +478,18 @@ public class ParameterNameEditPart extends
 					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;

 				}

@@ -497,7 +501,8 @@ public class ParameterNameEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -523,9 +528,10 @@ public class ParameterNameEditPart extends
 				@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();

@@ -576,8 +582,7 @@ public class ParameterNameEditPart extends
 	 * @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());

 		}

@@ -594,8 +599,7 @@ public class ParameterNameEditPart extends
 	 * @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());

 		}

@@ -605,13 +609,10 @@ public class ParameterNameEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -723,11 +724,14 @@ public class ParameterNameEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -740,8 +744,10 @@ public class ParameterNameEditPart extends
 	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;

 		}

@@ -762,11 +768,13 @@ public class ParameterNameEditPart extends
 				@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 {

@@ -780,7 +788,6 @@ public class ParameterNameEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -793,10 +800,10 @@ public class ParameterNameEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java
index c98410a3bc8..3feda907e34 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java
@@ -86,8 +86,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class PortAppliedStereotypeEditPart extends

-		AbstractLabelEditPart

+public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {

 

 	/**

@@ -129,12 +128,14 @@ public class PortAppliedStereotypeEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -151,7 +152,8 @@ public class PortAppliedStereotypeEditPart extends
 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeExternalNodeEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

 	}

 

@@ -178,7 +180,6 @@ public class PortAppliedStereotypeEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -284,8 +285,7 @@ public class PortAppliedStereotypeEditPart extends
 		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) {

@@ -316,8 +316,7 @@ public class PortAppliedStereotypeEditPart extends
 		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());

 	}

 

@@ -340,12 +339,14 @@ public class PortAppliedStereotypeEditPart extends
 					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(), PortAppliedStereotypeEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														PortAppliedStereotypeEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -469,13 +470,18 @@ public class PortAppliedStereotypeEditPart extends
 					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;

 				}

@@ -487,7 +493,8 @@ public class PortAppliedStereotypeEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -513,9 +520,10 @@ public class PortAppliedStereotypeEditPart extends
 				@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();

@@ -566,8 +574,7 @@ public class PortAppliedStereotypeEditPart extends
 	 * @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());

 		}

@@ -584,8 +591,7 @@ public class PortAppliedStereotypeEditPart extends
 	 * @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());

 		}

@@ -595,13 +601,10 @@ public class PortAppliedStereotypeEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -705,11 +708,14 @@ public class PortAppliedStereotypeEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -722,8 +728,10 @@ public class PortAppliedStereotypeEditPart extends
 	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;

 		}

@@ -744,11 +752,13 @@ public class PortAppliedStereotypeEditPart extends
 				@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 {

@@ -762,7 +772,6 @@ public class PortAppliedStereotypeEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -775,10 +784,10 @@ public class PortAppliedStereotypeEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
index 54589206577..3d5877d6c03 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
@@ -93,10 +93,10 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeIconlDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PortLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

 		installEditPolicy(BehaviorPortEditPolicy.BEHAVIOR_PORT, new BehaviorPortEditPolicy());

 		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

@@ -149,7 +149,6 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -163,8 +162,7 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 		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,7 +172,6 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -191,7 +188,6 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 		return (PortFigure) primaryShape;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -215,7 +211,6 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -265,7 +260,6 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -289,8 +283,4 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PortNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
index f313add4ab5..5e81ae4e059 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
@@ -88,8 +88,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class PortNameEditPart extends

-		FloatingLabelEditPart

+public class PortNameEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {

 

 	/**

@@ -131,12 +130,14 @@ public class PortNameEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortNameEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry

+						.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortNameEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -181,7 +182,6 @@ public class PortNameEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -297,8 +297,7 @@ public class PortNameEditPart extends
 		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) {

@@ -329,8 +328,7 @@ public class PortNameEditPart extends
 		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());

 	}

 

@@ -353,12 +351,14 @@ public class PortNameEditPart extends
 					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(), PortNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(), PortNameEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -482,13 +482,18 @@ public class PortNameEditPart extends
 					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;

 				}

@@ -500,7 +505,8 @@ public class PortNameEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -526,9 +532,10 @@ public class PortNameEditPart extends
 				@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();

@@ -579,8 +586,7 @@ public class PortNameEditPart extends
 	 * @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());

 		}

@@ -597,8 +603,7 @@ public class PortNameEditPart extends
 	 * @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());

 		}

@@ -608,13 +613,10 @@ public class PortNameEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -726,11 +728,14 @@ public class PortNameEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -743,8 +748,10 @@ public class PortNameEditPart extends
 	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;

 		}

@@ -765,11 +772,13 @@ public class PortNameEditPart extends
 				@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 +792,6 @@ public class PortNameEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -796,10 +804,10 @@ public class PortNameEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
index dd45bb11a47..ddcd500d093 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
@@ -91,9 +91,12 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -143,7 +146,6 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -157,8 +159,7 @@ public class PrimitiveTypeEditPart 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;

 				}

@@ -168,7 +169,6 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -194,7 +194,6 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -258,7 +257,6 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -308,7 +306,6 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -332,8 +329,4 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
index d6ed34233d6..d7866edd02d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
@@ -91,9 +91,12 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -143,7 +146,6 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -157,8 +159,7 @@ public class PrimitiveTypeEditPartCN 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;

 				}

@@ -168,7 +169,6 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -194,7 +194,6 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -258,7 +257,6 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -308,7 +306,6 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -332,8 +329,4 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPart.java
index eae75cca804..6fc735d43af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class PrimitiveTypeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 					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(), PrimitiveTypeFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																PrimitiveTypeFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 				@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 +777,6 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class PrimitiveTypeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPartCN.java
index beb75ae5070..d520a5bf80e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class PrimitiveTypeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 					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(), PrimitiveTypeFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																PrimitiveTypeFloatingLabelEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java
index 1fec7c86809..3d25cbb46da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 		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) {

@@ -290,8 +288,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PrimitiveTypeNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), PrimitiveTypeNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 					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;

 				}

@@ -461,7 +464,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 				@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();

@@ -546,8 +551,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	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;

 		}

@@ -732,11 +737,13 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 				@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 {

@@ -750,7 +757,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java
index e5d4b333087..c23b4f9623f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		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) {

@@ -290,8 +288,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PrimitiveTypeNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), PrimitiveTypeNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 					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;

 				}

@@ -461,7 +464,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 				@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();

@@ -546,8 +551,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	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;

 		}

@@ -732,11 +737,13 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 				@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 {

@@ -750,7 +757,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java
index 4e87bac2b14..b02297ff0fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java
@@ -133,7 +133,6 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -162,7 +161,6 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -278,8 +276,7 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 		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) {

@@ -310,8 +307,7 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 		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());

 	}

 

@@ -334,12 +330,13 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 					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(), PropertyEditPartCLN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), PropertyEditPartCLN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -463,13 +460,18 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 					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;

 				}

@@ -481,7 +483,8 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -507,9 +510,10 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 				@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();

@@ -566,8 +570,7 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 	 * @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());

 		}

@@ -584,8 +587,7 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 	 * @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());

 		}

@@ -595,13 +597,10 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -713,11 +712,14 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -730,8 +732,10 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 	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;

 		}

@@ -752,11 +756,13 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 				@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 {

@@ -770,7 +776,6 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -799,10 +804,10 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 			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 +824,8 @@ public class PropertyEditPartCLN extends CompartmentEditPart
 				}

 			}

 		}

-		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();

 		}

 		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
index 32b90dbd362..59ac40e1c50 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class PropertyPartCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class PropertyPartCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class PropertyPartCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class PropertyPartCompartmentEditPartCN
 		return Messages.PropertyPartCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class PropertyPartCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class PropertyPartCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
index 18c2ef31264..9287335bb6b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
@@ -106,13 +106,18 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PropertyLayoutEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY, new ShowHideRelatedContentsEditPolicy());

-		installEditPolicy(ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY, new ShowHideRelatedContentsEditPolicy());

+		installEditPolicy(ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY,

+				new ShowHideRelatedContentsEditPolicy());

+		installEditPolicy(ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY,

+				new ShowHideRelatedContentsEditPolicy());

 		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());

@@ -166,7 +171,6 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -180,8 +184,7 @@ public class PropertyPartEditPartCN 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;

 				}

@@ -191,7 +194,6 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -217,24 +219,20 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof PropertyPartCompartmentEditPartCN) {

 			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(((PropertyPartCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -310,7 +308,6 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -360,7 +357,6 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -384,8 +380,4 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartFloatingLabelEditPartCN.java
index 290bbc86616..402a50dc1da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class PropertyPartFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class PropertyPartFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class PropertyPartFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class PropertyPartFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class PropertyPartFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class PropertyPartFloatingLabelEditPartCN extends
 					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(), PropertyPartFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																PropertyPartFloatingLabelEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class PropertyPartFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class PropertyPartFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class PropertyPartFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class PropertyPartFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class PropertyPartFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class PropertyPartFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class PropertyPartFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class PropertyPartFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class PropertyPartFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class PropertyPartFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class PropertyPartFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java
index ef8529abf99..0a4bcb08971 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java
@@ -84,7 +84,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -125,7 +126,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -141,10 +141,10 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

-		installEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL, new IndirectPropertyLabelEditPolicy());

+		installEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL,

+				new IndirectPropertyLabelEditPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -260,8 +260,7 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 		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) {

@@ -292,8 +291,7 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 		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());

 	}

 

@@ -316,12 +314,13 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PropertyPartNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), PropertyPartNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -445,13 +444,18 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 					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;

 				}

@@ -463,7 +467,8 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -489,9 +494,10 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 				@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();

@@ -548,8 +554,7 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -566,8 +571,7 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -577,13 +581,10 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -695,11 +696,14 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 */

 	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);

 			}

 		}

 	}

@@ -712,8 +716,10 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	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;

 		}

@@ -734,11 +740,13 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 				@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 {

@@ -752,7 +760,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -769,7 +776,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -783,10 +789,10 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -803,7 +809,8 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 				}

 			}

 		}

-		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);

@@ -817,13 +824,11 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -849,7 +854,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
index cb2fbff6e71..bfb7155f058 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class ProtocolStateMachineCompositeCompartmentEditPart

-		extends LinkLFShapeCompartmentEditPart {

+public class ProtocolStateMachineCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class ProtocolStateMachineCompositeCompartmentEditPart
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class ProtocolStateMachineCompositeCompartmentEditPart
 		return Messages.ProtocolStateMachineCompositeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class ProtocolStateMachineCompositeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class ProtocolStateMachineCompositeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
index 4aa9fe084cc..2ef0026e5f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class ProtocolStateMachineCompositeCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class ProtocolStateMachineCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class ProtocolStateMachineCompositeCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class ProtocolStateMachineCompositeCompartmentEditPartCN
 		return Messages.ProtocolStateMachineCompositeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class ProtocolStateMachineCompositeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class ProtocolStateMachineCompositeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
index a11599e790d..76c712ce20e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
@@ -104,11 +104,15 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());

@@ -163,7 +167,6 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -177,8 +180,7 @@ public class ProtocolStateMachineCompositeEditPart 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;

 				}

@@ -188,7 +190,6 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -214,34 +215,27 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 			return true;

 		}

 

-

 		if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {

 			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(((ProtocolStateMachineCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -321,7 +315,6 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -371,7 +364,6 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -395,8 +387,4 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
index 7d09a9f34a3..16cfbc61157 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
@@ -103,11 +103,15 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -161,7 +165,6 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -175,8 +178,7 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 		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;

 				}

@@ -186,7 +188,6 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -212,34 +213,27 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 			return true;

 		}

 

-

 		if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {

 			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(((ProtocolStateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -319,7 +313,6 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -369,7 +362,6 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -390,11 +382,8 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 	 * @generated

 	 */

 	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));

+		return getChildBySemanticHint(

+				UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPart.java
index d8a7a19a7ea..e0ec52aba08 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ProtocolStateMachineCompositeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class ProtocolStateMachineCompositeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 					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(), ProtocolStateMachineCompositeFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														ProtocolStateMachineCompositeFloatingLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -378,7 +379,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.ProtocolStateMachine_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.ProtocolStateMachine_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -465,13 +467,18 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 				@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 +777,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java
index 211043b8b5d..3053d7c1de1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 					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(), ProtocolStateMachineCompositeFloatingLabelEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														ProtocolStateMachineCompositeFloatingLabelEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -378,7 +379,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.ProtocolStateMachine_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.ProtocolStateMachine_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -465,13 +467,18 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +571,7 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 				@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 +777,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java
index 093d056fd15..32069086614 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ProtocolStateMachineCompositeNameEditPart 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) {

@@ -290,8 +288,7 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 		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());

 	}

 

@@ -314,12 +311,15 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ProtocolStateMachineCompositeNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														ProtocolStateMachineCompositeNameEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +356,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.ProtocolStateMachine_Shape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.ProtocolStateMachine_Shape, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +444,18 @@ public class ProtocolStateMachineCompositeNameEditPart 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;

 				}

@@ -461,7 +467,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class ProtocolStateMachineCompositeNameEditPart 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();

@@ -546,8 +554,7 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	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;

 		}

@@ -732,11 +740,13 @@ public class ProtocolStateMachineCompositeNameEditPart 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 {

@@ -750,7 +760,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 				}

 			}

 		}

-		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);

@@ -815,13 +824,11 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java
index 77e375b5bdb..c886c4d71b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 		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) {

@@ -290,8 +288,7 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 		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());

 	}

 

@@ -314,12 +311,15 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ProtocolStateMachineCompositeNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														ProtocolStateMachineCompositeNameEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +356,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.ProtocolStateMachine_Shape_CN, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.ProtocolStateMachine_Shape_CN, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +444,18 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 					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;

 				}

@@ -461,7 +467,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 				@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();

@@ -546,8 +554,7 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	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;

 		}

@@ -732,11 +740,13 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 				@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 {

@@ -750,7 +760,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 				}

 			}

 		}

-		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);

@@ -815,13 +824,11 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
index add38d489a3..9e448850807 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		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,8 +295,7 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		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());

 	}

 

@@ -318,12 +318,16 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 					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(), RealizationAppliedStereotypeEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																RealizationAppliedStereotypeEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -447,13 +451,18 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 					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;

 				}

@@ -465,7 +474,8 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +501,10 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 				@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();

@@ -544,8 +555,7 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +572,7 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +582,10 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +689,14 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +709,10 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	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;

 		}

@@ -722,11 +733,13 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 				@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 {

@@ -740,7 +753,6 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +765,10 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java
index 3c2af0e649b..0e3ddbf3abd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFi
 /**

  * @generated

  */

-public class RealizationEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class RealizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,12 +53,11 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof RealizationNameEditPart) {

-			((RealizationNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+			((RealizationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof RealizationAppliedStereotypeEditPart) {

-			((RealizationAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((RealizationAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
index 2cae5dd6dfd..0c7e220afe4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class RealizationNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationNameEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 		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,8 +295,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 		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());

 	}

 

@@ -318,12 +318,13 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 					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(), RealizationNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), RealizationNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -447,13 +448,18 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 					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;

 				}

@@ -465,7 +471,8 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +498,10 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 				@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();

@@ -544,8 +552,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +569,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +579,10 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -691,11 +694,14 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 */

 	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);

 			}

 		}

 	}

@@ -708,8 +714,10 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	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;

 		}

@@ -730,11 +738,13 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 				@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 {

@@ -748,7 +758,6 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -761,10 +770,10 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java
index 5c91fc3eb72..a3fc533f41f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java
@@ -23,8 +23,7 @@ import org.eclipse.papyrus.uml.diagram.composite.custom.figures.RepresentationFi
 /**

  * @generated

  */

-public class RepresentationEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class RepresentationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -51,8 +50,7 @@ public class RepresentationEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof RepresentationTagLabelEditPart) {

-			((RepresentationTagLabelEditPart) childEditPart).setLabel(

-					getPrimaryShape().getTagLabel());

+			((RepresentationTagLabelEditPart) childEditPart).setLabel(getPrimaryShape().getTagLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
index 5bf68d48cbb..c7845547659 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationTagLabelEditPart.VISUAL_ID), new Point(0, 15));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationTagLabelEditPart.VISUAL_ID),

+				new Point(0, 15));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -263,8 +265,7 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 		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) {

@@ -295,8 +296,7 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 		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());

 	}

 

@@ -319,12 +319,14 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 					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(), RepresentationTagLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														RepresentationTagLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -448,13 +450,18 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 					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;

 				}

@@ -466,7 +473,8 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -492,9 +500,10 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 				@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();

@@ -545,8 +554,7 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -563,8 +571,7 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -574,13 +581,10 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -692,11 +696,14 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 */

 	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);

 			}

 		}

 	}

@@ -709,8 +716,10 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	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;

 		}

@@ -731,11 +740,13 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 				@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 {

@@ -749,7 +760,6 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -762,10 +772,10 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
index 655de498983..67240474eb8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		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,8 +295,7 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		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());

 	}

 

@@ -318,12 +318,16 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 					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(), RoleBindingAppliedStereotypeEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																RoleBindingAppliedStereotypeEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -360,7 +364,8 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.Dependency_RoleBindingEdge, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.Dependency_RoleBindingEdge, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -447,13 +452,18 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 					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;

 				}

@@ -465,7 +475,8 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +502,10 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 				@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();

@@ -544,8 +556,7 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +573,7 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +583,10 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +690,14 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +710,10 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	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;

 		}

@@ -722,11 +734,13 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 				@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 {

@@ -740,7 +754,6 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +766,10 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java
index 27234a55929..1faa6dc8b12 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.composite.custom.figures.RoleBindingFigur
 /**

  * @generated

  */

-public class RoleBindingEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class RoleBindingEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class RoleBindingEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,12 +53,11 @@ public class RoleBindingEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof RoleBindingRoleNameEditPart) {

-			((RoleBindingRoleNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getRoleLabel());

+			((RoleBindingRoleNameEditPart) childEditPart).setLabel(getPrimaryShape().getRoleLabel());

 		}

 		if (childEditPart instanceof RoleBindingAppliedStereotypeEditPart) {

-			((RoleBindingAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((RoleBindingAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
index edd777cd850..f90d2128a35 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingRoleNameEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingRoleNameEditPart.VISUAL_ID),

+				new Point(0, 20));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 		return ConnectionLocator.SOURCE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 		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,8 +295,7 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 		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());

 	}

 

@@ -318,12 +318,13 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 					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(), RoleBindingRoleNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), RoleBindingRoleNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -360,7 +361,8 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.Dependency_RoleBindingEdge, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.Dependency_RoleBindingEdge, getParserElement(), this,

+					VISUAL_ID);

 		}

 		return parser;

 	}

@@ -447,13 +449,18 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 					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;

 				}

@@ -465,7 +472,8 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +499,10 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 				@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();

@@ -544,8 +553,7 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +570,7 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +580,10 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +687,14 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +707,10 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	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;

 		}

@@ -722,11 +731,13 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 				@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 {

@@ -740,7 +751,6 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +763,10 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
index 6effc9d2f55..3205ff81865 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
@@ -89,7 +89,8 @@ public class SignalEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class SignalEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
index d4013b23e0c..6027cb11f89 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
@@ -89,7 +89,8 @@ public class SignalEditPartCN 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class SignalEditPartCN 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;

 				}

@@ -164,7 +163,6 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
index e65c2eb3907..1e621293f3c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
@@ -89,7 +89,8 @@ public class SignalEventEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class SignalEventEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalEventNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventFloatingLabelEditPart.java
index 2a8a2ee6bf3..1c709acf714 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SignalEventFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class SignalEventFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalEventFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalEventFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class SignalEventFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class SignalEventFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class SignalEventFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class SignalEventFloatingLabelEditPart extends
 					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(), SignalEventFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																SignalEventFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class SignalEventFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class SignalEventFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class SignalEventFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class SignalEventFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class SignalEventFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class SignalEventFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class SignalEventFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class SignalEventFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class SignalEventFloatingLabelEditPart extends
 				@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 +777,6 @@ public class SignalEventFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class SignalEventFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java
index d676ad834b7..26ed80543b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class SignalEventNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		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) {

@@ -290,8 +288,7 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), SignalEventNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), SignalEventNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 					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;

 				}

@@ -461,7 +464,8 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 				@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();

@@ -546,8 +551,7 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	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;

 		}

@@ -732,11 +737,13 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 				@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 {

@@ -750,7 +757,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPart.java
index a3826caf85c..c0969befeec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SignalFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class SignalFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class SignalFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class SignalFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class SignalFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class SignalFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,13 @@ public class SignalFloatingLabelEditPart extends
 					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(), SignalFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), SignalFloatingLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +464,18 @@ public class SignalFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +487,8 @@ public class SignalFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +514,10 @@ public class SignalFloatingLabelEditPart extends
 				@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();

@@ -562,8 +568,7 @@ public class SignalFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +585,7 @@ public class SignalFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +595,10 @@ public class SignalFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +710,14 @@ public class SignalFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +730,10 @@ public class SignalFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +754,13 @@ public class SignalFloatingLabelEditPart extends
 				@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 +774,6 @@ public class SignalFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +786,10 @@ public class SignalFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPartCN.java
index b4694aa6f81..b3e55ac23ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SignalFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class SignalFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class SignalFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class SignalFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class SignalFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class SignalFloatingLabelEditPartCN extends
 					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(), SignalFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														SignalFloatingLabelEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +465,18 @@ public class SignalFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class SignalFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class SignalFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +569,7 @@ public class SignalFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class SignalFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class SignalFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class SignalFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class SignalFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class SignalFloatingLabelEditPartCN extends
 				@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 +775,6 @@ public class SignalFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class SignalFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java
index 19e993a207c..52995f72944 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SignalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class SignalNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 		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) {

@@ -290,8 +288,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), SignalNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), SignalNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 					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;

 				}

@@ -461,7 +464,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 				@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();

@@ -546,8 +551,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	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;

 		}

@@ -732,11 +737,13 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 				@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 {

@@ -750,7 +757,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java
index dcce2c59d39..04e284353f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class SignalNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 		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) {

@@ -290,8 +288,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), SignalNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), SignalNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 					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;

 				}

@@ -461,7 +464,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 				@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();

@@ -546,8 +551,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	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;

 		}

@@ -732,11 +737,13 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 				@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 {

@@ -750,7 +757,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
index 77a63feebf3..5b45923f968 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class StateMachineCompositeCompartmentEditPart

-		extends LinkLFShapeCompartmentEditPart {

+public class StateMachineCompositeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class StateMachineCompositeCompartmentEditPart
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class StateMachineCompositeCompartmentEditPart
 		return Messages.StateMachineCompositeCompartmentEditPart_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class StateMachineCompositeCompartmentEditPart
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class StateMachineCompositeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
index 4e4a9d1bcba..53a73c3c830 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
@@ -39,8 +39,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
 /**

  * @generated

  */

-public class StateMachineCompositeCompartmentEditPartCN

-		extends LinkLFShapeCompartmentEditPart {

+public class StateMachineCompositeCompartmentEditPartCN extends LinkLFShapeCompartmentEditPart {

 

 	/**

 	 * @generated

@@ -54,7 +53,6 @@ public class StateMachineCompositeCompartmentEditPartCN
 		super(view);

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public class StateMachineCompositeCompartmentEditPartCN
 		return Messages.StateMachineCompositeCompartmentEditPartCN_title;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -80,9 +77,6 @@ public class StateMachineCompositeCompartmentEditPartCN
 		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

 	}

 

-

-

-

 	/**

 	 * @generated

 	 */

@@ -124,10 +118,7 @@ public class StateMachineCompositeCompartmentEditPartCN
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(

-				this,

-				getFigure(),

-				new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
index f10198bdfd4..08d016c4187 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
@@ -104,11 +104,15 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new SideAffixedNodesCreationEditPolicy());

@@ -163,7 +167,6 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -177,8 +180,7 @@ public class StateMachineCompositeEditPart 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;

 				}

@@ -188,7 +190,6 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -214,34 +215,27 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		if (childEditPart instanceof StateMachineCompositeCompartmentEditPart) {

 			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(((StateMachineCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -321,7 +315,6 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -371,7 +364,6 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -395,8 +387,4 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
index 6fba473468a..0afc96328b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
@@ -103,11 +103,15 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE,

+				new AffixedNodeAlignmentEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -161,7 +165,6 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -175,8 +178,7 @@ public class StateMachineCompositeEditPartCN 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;

 				}

@@ -186,7 +188,6 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -212,34 +213,27 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 			return true;

 		}

 

-

 		if (childEditPart instanceof StateMachineCompositeCompartmentEditPartCN) {

 			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(((StateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

 

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

-

-

-		// Papyrus Gencode :Affixed Port locator

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -319,7 +313,6 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -369,7 +362,6 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -393,8 +385,4 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPart.java
index 9c6141c816d..857ef3db4bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class StateMachineCompositeFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 					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(), StateMachineCompositeFloatingLabelEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														StateMachineCompositeFloatingLabelEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +466,18 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +489,8 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +516,10 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 				@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();

@@ -562,8 +570,7 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +587,7 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +597,10 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +712,14 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +732,10 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +756,13 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 				@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 +776,6 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +788,10 @@ public class StateMachineCompositeFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPartCN.java
index 86e647c2b9a..730a8396d73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class StateMachineCompositeFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,15 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 					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(), StateMachineCompositeFloatingLabelEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(),

+														StateMachineCompositeFloatingLabelEditPartCN.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +466,18 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +489,8 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +516,10 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +570,7 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +587,7 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +597,10 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +712,14 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +732,10 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +756,13 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 				@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 +776,6 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +788,10 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java
index 00d5c7097bd..2ac30b53576 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class StateMachineCompositeNameEditPart 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) {

@@ -290,8 +288,7 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), StateMachineCompositeNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																StateMachineCompositeNameEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +444,18 @@ public class StateMachineCompositeNameEditPart 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;

 				}

@@ -461,7 +467,8 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class StateMachineCompositeNameEditPart 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();

@@ -546,8 +554,7 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	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;

 		}

@@ -732,11 +740,13 @@ public class StateMachineCompositeNameEditPart 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 {

@@ -750,7 +760,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 				}

 			}

 		}

-		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);

@@ -815,13 +824,11 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java
index d5ad3aa4422..39032d94039 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class StateMachineCompositeNameEditPartCN 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) {

@@ -290,8 +288,7 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 		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());

 	}

 

@@ -314,12 +311,16 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), StateMachineCompositeNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																StateMachineCompositeNameEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +444,18 @@ public class StateMachineCompositeNameEditPartCN 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;

 				}

@@ -461,7 +467,8 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +494,10 @@ public class StateMachineCompositeNameEditPartCN 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();

@@ -546,8 +554,7 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +571,7 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +581,10 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +696,14 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +716,10 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	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;

 		}

@@ -732,11 +740,13 @@ public class StateMachineCompositeNameEditPartCN 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 {

@@ -750,7 +760,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +776,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +789,10 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +809,8 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 				}

 			}

 		}

-		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);

@@ -815,13 +824,11 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +854,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
index 09b93f17d36..38f716cb298 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
@@ -89,7 +89,8 @@ public class StringExpressionEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class StringExpressionEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(StringExpressionNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionFloatingLabelEditPart.java
index 54d323c9d57..1d8d554fabe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class StringExpressionFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class StringExpressionFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StringExpressionFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.StringExpressionFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class StringExpressionFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class StringExpressionFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class StringExpressionFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class StringExpressionFloatingLabelEditPart extends
 					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(), StringExpressionFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																StringExpressionFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -378,7 +380,8 @@ public class StringExpressionFloatingLabelEditPart extends
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.StringExpression_PackagedElementShape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.StringExpression_PackagedElementShape, getParserElement(),

+					this, VISUAL_ID);

 		}

 		return parser;

 	}

@@ -465,13 +468,18 @@ public class StringExpressionFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +491,8 @@ public class StringExpressionFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +518,10 @@ public class StringExpressionFloatingLabelEditPart extends
 				@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();

@@ -562,8 +572,7 @@ public class StringExpressionFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +589,7 @@ public class StringExpressionFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +599,10 @@ public class StringExpressionFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +714,14 @@ public class StringExpressionFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +734,10 @@ public class StringExpressionFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +758,13 @@ public class StringExpressionFloatingLabelEditPart extends
 				@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 +778,6 @@ public class StringExpressionFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +790,10 @@ public class StringExpressionFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java
index 4fdbc65979b..33fc05a9964 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		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) {

@@ -290,8 +288,7 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), StringExpressionNameEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														StringExpressionNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -356,7 +355,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	public IParser getParser() {

 		if (parser == null) {

-			parser = ParserUtil.getParser(UMLElementTypes.StringExpression_PackagedElementShape, getParserElement(), this, VISUAL_ID);

+			parser = ParserUtil.getParser(UMLElementTypes.StringExpression_PackagedElementShape, getParserElement(),

+					this, VISUAL_ID);

 		}

 		return parser;

 	}

@@ -443,13 +443,18 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 					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;

 				}

@@ -461,7 +466,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +493,10 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 				@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();

@@ -546,8 +553,7 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +570,7 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +580,10 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +695,14 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +715,10 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	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;

 		}

@@ -732,11 +739,13 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 				@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 {

@@ -750,7 +759,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +775,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +788,10 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +808,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 				}

 			}

 		}

-		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);

@@ -815,13 +823,11 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +853,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
index dd19807269b..ee487eeffa7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class SubstitutionAppliedStereotypeEditPart 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) {

@@ -294,8 +295,7 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		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());

 	}

 

@@ -318,12 +318,16 @@ public class SubstitutionAppliedStereotypeEditPart 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(), SubstitutionAppliedStereotypeEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																SubstitutionAppliedStereotypeEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -447,13 +451,18 @@ public class SubstitutionAppliedStereotypeEditPart 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;

 				}

@@ -465,7 +474,8 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +501,10 @@ public class SubstitutionAppliedStereotypeEditPart 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();

@@ -544,8 +555,7 @@ public class SubstitutionAppliedStereotypeEditPart 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());

 		}

@@ -562,8 +572,7 @@ public class SubstitutionAppliedStereotypeEditPart 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());

 		}

@@ -573,13 +582,10 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +689,14 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +709,10 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	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;

 		}

@@ -722,11 +733,13 @@ public class SubstitutionAppliedStereotypeEditPart 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 {

@@ -740,7 +753,6 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +765,10 @@ public class SubstitutionAppliedStereotypeEditPart 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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java
index 335a744f616..acb228b3d8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFi
 /**

  * @generated

  */

-public class SubstitutionEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,12 +53,11 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof SubstitutionNameEditPart) {

-			((SubstitutionNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+			((SubstitutionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {

-			((SubstitutionAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((SubstitutionAppliedStereotypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
index ebfd5f29a93..83eccdef05e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class SubstitutionNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionNameEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 		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,8 +295,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 		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());

 	}

 

@@ -318,12 +318,13 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 					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(), SubstitutionNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), SubstitutionNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -447,13 +448,18 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 					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;

 				}

@@ -465,7 +471,8 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +498,10 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 				@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();

@@ -544,8 +552,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +569,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +579,10 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -691,11 +694,14 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 */

 	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);

 			}

 		}

 	}

@@ -708,8 +714,10 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	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;

 		}

@@ -730,11 +738,13 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 				@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 {

@@ -748,7 +758,6 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -761,10 +770,10 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
index 798d14b97d4..4a9897b4750 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
@@ -74,7 +74,8 @@ public class TimeConstraintEditPart 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());

 		// 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);

 	}

@@ -107,7 +108,6 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -118,7 +118,6 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -148,7 +147,6 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -192,7 +190,6 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 		return getContentPane();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -201,7 +198,6 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -251,7 +247,6 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -275,8 +270,4 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeConstraintNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
index 4e3e012a200..56eb6c9e18c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
@@ -74,7 +74,8 @@ public class TimeConstraintEditPartCN 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());

 		// 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);

 	}

@@ -107,7 +108,6 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -118,7 +118,6 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -148,7 +147,6 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -192,7 +190,6 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 		return getContentPane();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -201,7 +198,6 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -251,7 +247,6 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -275,8 +270,4 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeConstraintNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java
index fea3debfe47..658d4c1e0da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 		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) {

@@ -290,8 +288,7 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), TimeConstraintNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), TimeConstraintNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 					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;

 				}

@@ -461,7 +464,8 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 				@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();

@@ -546,8 +551,7 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	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;

 		}

@@ -732,11 +737,13 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 				@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 {

@@ -750,7 +757,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java
index 19ce188ec53..670a9e2e754 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 		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) {

@@ -290,8 +288,7 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 		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());

 	}

 

@@ -314,12 +311,14 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), TimeConstraintNameEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														TimeConstraintNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +442,18 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 					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;

 				}

@@ -461,7 +465,8 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +492,10 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 				@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();

@@ -546,8 +552,7 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +569,7 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +579,10 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +694,14 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +714,10 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	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;

 		}

@@ -732,11 +738,13 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 				@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 {

@@ -750,7 +758,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +774,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +787,10 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +807,8 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 				}

 			}

 		}

-		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);

@@ -815,13 +822,11 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +852,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java
index 05e6a057549..1189169c14b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java
@@ -79,7 +79,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -120,7 +121,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -138,7 +138,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -244,8 +243,7 @@ public class TimeConstraintSpecificationEditPart 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) {

@@ -276,8 +274,7 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 		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());

 	}

 

@@ -300,12 +297,16 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), TimeConstraintSpecificationEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																TimeConstraintSpecificationEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -429,13 +430,18 @@ public class TimeConstraintSpecificationEditPart 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;

 				}

@@ -447,7 +453,8 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -473,9 +480,10 @@ public class TimeConstraintSpecificationEditPart 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();

@@ -532,8 +540,7 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -550,8 +557,7 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -561,13 +567,10 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -679,11 +682,14 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 */

 	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);

 			}

 		}

 	}

@@ -696,8 +702,10 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	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;

 		}

@@ -718,11 +726,13 @@ public class TimeConstraintSpecificationEditPart 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 {

@@ -736,7 +746,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,7 +762,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,10 +775,10 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -798,13 +806,11 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -830,7 +836,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java
index 58ccb4b4003..b2e412d1e72 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java
@@ -79,7 +79,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -120,7 +121,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -138,7 +138,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -244,8 +243,7 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 		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,8 +274,7 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 		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());

 	}

 

@@ -300,12 +297,16 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), TimeConstraintSpecificationEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																TimeConstraintSpecificationEditPartCN.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -429,13 +430,18 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 					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;

 				}

@@ -447,7 +453,8 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -473,9 +480,10 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 				@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();

@@ -532,8 +540,7 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -550,8 +557,7 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -561,13 +567,10 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -679,11 +682,14 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 */

 	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);

 			}

 		}

 	}

@@ -696,8 +702,10 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	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;

 		}

@@ -718,11 +726,13 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 				@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 {

@@ -736,7 +746,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,7 +762,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,10 +775,10 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -798,13 +806,11 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -830,7 +836,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
index 6c856ff60bb..c92e01470b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
@@ -89,7 +89,8 @@ public class TimeEventEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class TimeEventEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeEventNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventFloatingLabelEditPart.java
index 356a0c570be..066f4731c68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeEventFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class TimeEventFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeEventFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeEventFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class TimeEventFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class TimeEventFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class TimeEventFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class TimeEventFloatingLabelEditPart extends
 					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(), TimeEventFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														TimeEventFloatingLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +465,18 @@ public class TimeEventFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class TimeEventFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class TimeEventFloatingLabelEditPart extends
 				@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();

@@ -562,8 +569,7 @@ public class TimeEventFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class TimeEventFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class TimeEventFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class TimeEventFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class TimeEventFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class TimeEventFloatingLabelEditPart extends
 				@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 +775,6 @@ public class TimeEventFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class TimeEventFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java
index dd944dc25e2..52d8fd9c210 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class TimeEventNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 		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) {

@@ -290,8 +288,7 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), TimeEventNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), TimeEventNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 					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;

 				}

@@ -461,7 +464,8 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 				@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();

@@ -546,8 +551,7 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	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;

 		}

@@ -732,11 +737,13 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 				@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 {

@@ -750,7 +757,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
index ee97e064e4d..6baeb29042d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
@@ -89,7 +89,8 @@ public class TimeExpressionEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class TimeExpressionEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeExpressionNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionFloatingLabelEditPart.java
index 7350cb30eb8..5425cd22795 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeExpressionFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class TimeExpressionFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeExpressionFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeExpressionFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class TimeExpressionFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class TimeExpressionFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class TimeExpressionFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class TimeExpressionFloatingLabelEditPart extends
 					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(), TimeExpressionFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																TimeExpressionFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class TimeExpressionFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class TimeExpressionFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class TimeExpressionFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class TimeExpressionFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class TimeExpressionFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class TimeExpressionFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class TimeExpressionFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class TimeExpressionFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class TimeExpressionFloatingLabelEditPart extends
 				@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 +777,6 @@ public class TimeExpressionFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class TimeExpressionFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java
index ec7c8ed313f..bc1481ab93a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 		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) {

@@ -290,8 +288,7 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), TimeExpressionNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), TimeExpressionNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 					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;

 				}

@@ -461,7 +464,8 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 				@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();

@@ -546,8 +551,7 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	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;

 		}

@@ -732,11 +737,13 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 				@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 {

@@ -750,7 +757,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
index 516f5a2bd6a..bec366b66cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
@@ -89,7 +89,8 @@ public class TimeIntervalEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class TimeIntervalEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeIntervalNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalFloatingLabelEditPart.java
index 947e9d01d89..4ac91ff7336 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeIntervalFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class TimeIntervalFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeIntervalFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeIntervalFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class TimeIntervalFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class TimeIntervalFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class TimeIntervalFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,16 @@ public class TimeIntervalFloatingLabelEditPart extends
 					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(), TimeIntervalFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																TimeIntervalFloatingLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +467,18 @@ public class TimeIntervalFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +490,8 @@ public class TimeIntervalFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +517,10 @@ public class TimeIntervalFloatingLabelEditPart extends
 				@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();

@@ -562,8 +571,7 @@ public class TimeIntervalFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +588,7 @@ public class TimeIntervalFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +598,10 @@ public class TimeIntervalFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +713,14 @@ public class TimeIntervalFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +733,10 @@ public class TimeIntervalFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +757,13 @@ public class TimeIntervalFloatingLabelEditPart extends
 				@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 +777,6 @@ public class TimeIntervalFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +789,10 @@ public class TimeIntervalFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java
index 8349a4bc023..cfbc3bfd163 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 		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) {

@@ -290,8 +288,7 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), TimeIntervalNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), TimeIntervalNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 					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;

 				}

@@ -461,7 +464,8 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 				@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();

@@ -546,8 +551,7 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	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;

 		}

@@ -732,11 +737,13 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 				@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 {

@@ -750,7 +757,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
index 2a1398ba016..c618b1a6958 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
@@ -89,7 +89,8 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeIconlDisplayEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ObservationLayoutEditPolicy());

@@ -143,7 +144,6 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -157,8 +157,7 @@ public class TimeObservationEditPart 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;

 				}

@@ -168,7 +167,6 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -185,7 +183,6 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 		return (RoundedCompartmentFigure) primaryShape;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -209,7 +206,6 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -254,7 +250,6 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -278,8 +273,4 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEventEditPart.java
index 87834668125..499c3807f7b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEventEditPart.java
@@ -22,8 +22,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure
 /**

  * @generated

  */

-public class TimeObservationEventEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart {

+public class TimeObservationEventEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,10 +44,6 @@ public class TimeObservationEventEditPart extends ConnectionEditPart
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 	}

 

-

-

-

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java
index d8c207a83a7..8623f67fc55 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java
@@ -84,8 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeObservationNameEditPart extends

-		FloatingLabelEditPart

+public class TimeObservationNameEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {

 

 	/**

@@ -127,12 +126,14 @@ public class TimeObservationNameEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationNameEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationNameEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -175,7 +176,6 @@ public class TimeObservationNameEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -281,8 +281,7 @@ public class TimeObservationNameEditPart extends
 		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) {

@@ -313,8 +312,7 @@ public class TimeObservationNameEditPart extends
 		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());

 	}

 

@@ -337,12 +335,13 @@ public class TimeObservationNameEditPart extends
 					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(), TimeObservationNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), TimeObservationNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -466,13 +465,18 @@ public class TimeObservationNameEditPart extends
 					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;

 				}

@@ -484,7 +488,8 @@ public class TimeObservationNameEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -510,9 +515,10 @@ public class TimeObservationNameEditPart extends
 				@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();

@@ -563,8 +569,7 @@ public class TimeObservationNameEditPart extends
 	 * @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());

 		}

@@ -581,8 +586,7 @@ public class TimeObservationNameEditPart extends
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -592,13 +596,10 @@ public class TimeObservationNameEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -710,11 +711,14 @@ public class TimeObservationNameEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -727,8 +731,10 @@ public class TimeObservationNameEditPart extends
 	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;

 		}

@@ -749,11 +755,13 @@ public class TimeObservationNameEditPart extends
 				@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 {

@@ -767,7 +775,6 @@ public class TimeObservationNameEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -780,10 +787,10 @@ public class TimeObservationNameEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
index 96c28787e2a..b593d3ddccd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
@@ -86,8 +86,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeObservationStereotypeLabelEditPart extends

-		AbstractLabelEditPart

+public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {

 

 	/**

@@ -129,12 +128,14 @@ public class TimeObservationStereotypeLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -151,7 +152,8 @@ public class TimeObservationStereotypeLabelEditPart extends
 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeExternalNodeEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());

 	}

 

@@ -178,7 +180,6 @@ public class TimeObservationStereotypeLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -284,8 +285,7 @@ public class TimeObservationStereotypeLabelEditPart extends
 		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) {

@@ -316,8 +316,7 @@ public class TimeObservationStereotypeLabelEditPart extends
 		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());

 	}

 

@@ -340,12 +339,16 @@ public class TimeObservationStereotypeLabelEditPart extends
 					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(), TimeObservationStereotypeLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(

+														ParserUtil.getParserAdapter(getParserElement(),

+																TimeObservationStereotypeLabelEditPart.this),

+														(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -469,13 +472,18 @@ public class TimeObservationStereotypeLabelEditPart extends
 					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;

 				}

@@ -487,7 +495,8 @@ public class TimeObservationStereotypeLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -513,9 +522,10 @@ public class TimeObservationStereotypeLabelEditPart extends
 				@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();

@@ -566,8 +576,7 @@ public class TimeObservationStereotypeLabelEditPart extends
 	 * @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());

 		}

@@ -584,8 +593,7 @@ public class TimeObservationStereotypeLabelEditPart extends
 	 * @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());

 		}

@@ -595,13 +603,10 @@ public class TimeObservationStereotypeLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -713,11 +718,14 @@ public class TimeObservationStereotypeLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -730,8 +738,10 @@ public class TimeObservationStereotypeLabelEditPart extends
 	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;

 		}

@@ -752,11 +762,13 @@ public class TimeObservationStereotypeLabelEditPart extends
 				@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 {

@@ -770,7 +782,6 @@ public class TimeObservationStereotypeLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -783,10 +794,10 @@ public class TimeObservationStereotypeLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java
index 5afa2cb3787..463ac6aa370 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java
@@ -884,19 +884,15 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case BehaviorPortLinkEditPart.VISUAL_ID:

 				return new BehaviorPortLinkEditPart(view);

 

-

 			case LinkDescriptorEditPart.VISUAL_ID:

 				return new LinkDescriptorEditPart(view);

 

-

 			case CommentAnnotatedElementEditPart.VISUAL_ID:

 				return new CommentAnnotatedElementEditPart(view);

 

-

 			case ConstraintConstrainedElementEditPart.VISUAL_ID:

 				return new ConstraintConstrainedElementEditPart(view);

 

-

 			case ComponentRealizationEditPart.VISUAL_ID:

 				return new ComponentRealizationEditPart(view);

 

@@ -906,7 +902,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new ComponentRealizationAppliedStereotypeEditPart(view);

 

-

 			case InterfaceRealizationEditPart.VISUAL_ID:

 				return new InterfaceRealizationEditPart(view);

 

@@ -916,7 +911,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new InterfaceRealizationAppliedStereotypeEditPart(view);

 

-

 			case SubstitutionEditPart.VISUAL_ID:

 				return new SubstitutionEditPart(view);

 

@@ -926,7 +920,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:

 				return new SubstitutionAppliedStereotypeEditPart(view);

 

-

 			case RealizationEditPart.VISUAL_ID:

 				return new RealizationEditPart(view);

 

@@ -936,7 +929,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case RealizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new RealizationAppliedStereotypeEditPart(view);

 

-

 			case ManifestationEditPart.VISUAL_ID:

 				return new ManifestationEditPart(view);

 

@@ -946,7 +938,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case ManifestationAppliedStereotypeEditPart.VISUAL_ID:

 				return new ManifestationAppliedStereotypeEditPart(view);

 

-

 			case AbstractionEditPart.VISUAL_ID:

 				return new AbstractionEditPart(view);

 

@@ -956,7 +947,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case AbstractionAppliedStereotypeEditPart.VISUAL_ID:

 				return new AbstractionAppliedStereotypeEditPart(view);

 

-

 			case UsageEditPart.VISUAL_ID:

 				return new UsageEditPart(view);

 

@@ -966,7 +956,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case UsageAppliedStereotypeEditPart.VISUAL_ID:

 				return new UsageAppliedStereotypeEditPart(view);

 

-

 			case DeploymentEditPart.VISUAL_ID:

 				return new DeploymentEditPart(view);

 

@@ -976,7 +965,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case DeploymentAppliedStereotypeEditPart.VISUAL_ID:

 				return new DeploymentAppliedStereotypeEditPart(view);

 

-

 			case RoleBindingEditPart.VISUAL_ID:

 				return new RoleBindingEditPart(view);

 

@@ -986,7 +974,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case RoleBindingAppliedStereotypeEditPart.VISUAL_ID:

 				return new RoleBindingAppliedStereotypeEditPart(view);

 

-

 			case DependencyEditPart.VISUAL_ID:

 				return new DependencyEditPart(view);

 

@@ -996,7 +983,6 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case DependencyAppliedStereotypeEditPart.VISUAL_ID:

 				return new DependencyAppliedStereotypeEditPart(view);

 

-

 			case ConnectorEditPart.VISUAL_ID:

 				return new ConnectorEditPart(view);

 

@@ -1012,29 +998,24 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case ConnectorMultiplicityTargetEditPart.VISUAL_ID:

 				return new ConnectorMultiplicityTargetEditPart(view);

 

-

 			case GeneralizationEditPart.VISUAL_ID:

 				return new GeneralizationEditPart(view);

 

 			case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new GeneralizationAppliedStereotypeEditPart(view);

 

-

 			case TimeObservationEventEditPart.VISUAL_ID:

 				return new TimeObservationEventEditPart(view);

 

-

 			case DurationObservationEventEditPart.VISUAL_ID:

 				return new DurationObservationEventEditPart(view);

 

-

 			case RepresentationEditPart.VISUAL_ID:

 				return new RepresentationEditPart(view);

 

 			case RepresentationTagLabelEditPart.VISUAL_ID:

 				return new RepresentationTagLabelEditPart(view);

 

-

 			case InformationFlowEditPart.VISUAL_ID:

 				return new InformationFlowEditPart(view);

 

@@ -1063,18 +1044,15 @@ public class UMLEditPartFactory implements EditPartFactory {
 	/**

 	 * @generated

 	 */

-	public static CellEditorLocator getTextCellEditorLocator(

-			ITextAwareEditPart source) {

+	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);

 

 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -1109,8 +1087,7 @@ public class UMLEditPartFactory implements EditPartFactory {
 			rect.y = getMultilineEditableFigure().getEditionLocation().y;

 			getMultilineEditableFigure().translateToAbsolute(rect);

 			if (getMultilineEditableFigure().getText().length() > 0) {

-				rect.setSize(new Dimension(text.computeSize(rect.width,

-						SWT.DEFAULT)));

+				rect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT)));

 			}

 			if (!rect.equals(new Rectangle(text.getBounds()))) {

 				text.setBounds(rect.x, rect.y, rect.width, rect.height);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
index b605d90f852..626b41bcc21 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID),

+				new Point(0, 30));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 		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,8 +295,7 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 		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());

 	}

 

@@ -318,12 +318,14 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 					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(), UsageAppliedStereotypeEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														UsageAppliedStereotypeEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -447,13 +449,18 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 					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;

 				}

@@ -465,7 +472,8 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +499,10 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 				@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();

@@ -544,8 +553,7 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -562,8 +570,7 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -573,13 +580,10 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -683,11 +687,14 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 */

 	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);

 			}

 		}

 	}

@@ -700,8 +707,10 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	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;

 		}

@@ -722,11 +731,13 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 				@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 {

@@ -740,7 +751,6 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -753,10 +763,10 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java
index 32a0908ea11..91d481ba467 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java
@@ -24,8 +24,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
 /**

  * @generated

  */

-public class UsageEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart {

+public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

 

 	/**

 	 * @generated

@@ -45,7 +44,8 @@ public class UsageEditPart extends UMLConnectionNodeEditPart
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

@@ -53,12 +53,10 @@ public class UsageEditPart extends UMLConnectionNodeEditPart
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof UsageNameEditPart) {

-			((UsageNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+			((UsageNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof UsageAppliedStereotypeEditPart) {

-			((UsageAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+			((UsageAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
index 27a228c59e5..eff78f7567a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
@@ -82,7 +82,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

+public class UsageNameEditPart extends PapyrusLabelEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -123,12 +124,14 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry

+						.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageNameEditPart.VISUAL_ID),

+				new Point(0, 60));

 	}

 

 	/**

@@ -156,7 +159,6 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 		return ConnectionLocator.MIDDLE;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -262,8 +264,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 		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,8 +295,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 		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());

 	}

 

@@ -318,12 +318,14 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 					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(), UsageNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(

+												ParserUtil.getParserAdapter(getParserElement(), UsageNameEditPart.this),

+												(String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -447,13 +449,18 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 					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;

 				}

@@ -465,7 +472,8 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -491,9 +499,10 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 				@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();

@@ -544,8 +553,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 * @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());

 		}

@@ -562,8 +570,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 * @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());

 		}

@@ -573,13 +580,10 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -691,11 +695,14 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 */

 	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);

 			}

 		}

 	}

@@ -708,8 +715,10 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	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;

 		}

@@ -730,11 +739,13 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 				@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 {

@@ -748,7 +759,6 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -761,10 +771,10 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
index be56b7d5d27..c01489bb51d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
@@ -89,7 +89,8 @@ public class UseCaseEditPart 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class UseCaseEditPart 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;

 				}

@@ -164,7 +163,6 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseNameEditPart.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
index aacca4e3bd9..f45e5647be0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
@@ -89,7 +89,8 @@ public class UseCaseEditPartCN 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(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// 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);

@@ -139,7 +140,6 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 		return lep;

 	}

 

-

 	/**

 	 * Papyrus codeGen

 	 * 

@@ -153,8 +153,7 @@ public class UseCaseEditPartCN 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;

 				}

@@ -164,7 +163,6 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -190,7 +188,6 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -254,7 +251,6 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 		return result;

 	}

 

-

 	/**

 	 * Creates figure for this edit part.

 	 * 

@@ -304,7 +300,6 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -328,8 +323,4 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseNameEditPartCN.VISUAL_ID));

 	}

 

-

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPart.java
index f4c06551cc8..d497cfd3bb4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPart.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class UseCaseFloatingLabelEditPart extends

-		FloatingLabelEditPart

+public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class UseCaseFloatingLabelEditPart extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseFloatingLabelEditPart.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class UseCaseFloatingLabelEditPart extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class UseCaseFloatingLabelEditPart extends
 		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) {

@@ -312,8 +311,7 @@ public class UseCaseFloatingLabelEditPart extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class UseCaseFloatingLabelEditPart extends
 					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(), UseCaseFloatingLabelEditPart.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														UseCaseFloatingLabelEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +465,18 @@ public class UseCaseFloatingLabelEditPart extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class UseCaseFloatingLabelEditPart extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class UseCaseFloatingLabelEditPart extends
 				@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();

@@ -562,8 +569,7 @@ public class UseCaseFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class UseCaseFloatingLabelEditPart extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class UseCaseFloatingLabelEditPart extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class UseCaseFloatingLabelEditPart extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class UseCaseFloatingLabelEditPart extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class UseCaseFloatingLabelEditPart extends
 				@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 +775,6 @@ public class UseCaseFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class UseCaseFloatingLabelEditPart extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPartCN.java
index ea9b2d2453c..1b21ea79044 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPartCN.java
@@ -83,8 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class UseCaseFloatingLabelEditPartCN extends

-		FloatingLabelEditPart

+public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart

 		implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

@@ -126,12 +125,14 @@ public class UseCaseFloatingLabelEditPartCN extends
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseFloatingLabelEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(

+				UMLVisualIDRegistry.getType(

+						org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseFloatingLabelEditPartCN.VISUAL_ID),

+				new Point(0, 0));

 	}

 

 	/**

@@ -174,7 +175,6 @@ public class UseCaseFloatingLabelEditPartCN extends
 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -280,8 +280,7 @@ public class UseCaseFloatingLabelEditPartCN extends
 		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) {

@@ -312,8 +311,7 @@ public class UseCaseFloatingLabelEditPartCN extends
 		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());

 	}

 

@@ -336,12 +334,14 @@ public class UseCaseFloatingLabelEditPartCN extends
 					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(), UseCaseFloatingLabelEditPartCN.this), (String) value));

+										setResult(

+												parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(),

+														UseCaseFloatingLabelEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -465,13 +465,18 @@ public class UseCaseFloatingLabelEditPartCN extends
 					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;

 				}

@@ -483,7 +488,8 @@ public class UseCaseFloatingLabelEditPartCN extends
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -509,9 +515,10 @@ public class UseCaseFloatingLabelEditPartCN extends
 				@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();

@@ -562,8 +569,7 @@ public class UseCaseFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -580,8 +586,7 @@ public class UseCaseFloatingLabelEditPartCN extends
 	 * @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());

 		}

@@ -591,13 +596,10 @@ public class UseCaseFloatingLabelEditPartCN extends
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -709,11 +711,14 @@ public class UseCaseFloatingLabelEditPartCN extends
 	 */

 	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);

 			}

 		}

 	}

@@ -726,8 +731,10 @@ public class UseCaseFloatingLabelEditPartCN extends
 	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;

 		}

@@ -748,11 +755,13 @@ public class UseCaseFloatingLabelEditPartCN extends
 				@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 +775,6 @@ public class UseCaseFloatingLabelEditPartCN extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -779,10 +787,10 @@ public class UseCaseFloatingLabelEditPartCN extends
 			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())) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java
index fd8f5898604..4a48d113e98 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class UseCaseNameEditPart extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 		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) {

@@ -290,8 +288,7 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), UseCaseNameEditPart.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), UseCaseNameEditPart.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 					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;

 				}

@@ -461,7 +464,8 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 				@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();

@@ -546,8 +551,7 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	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;

 		}

@@ -732,11 +737,13 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 				@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 {

@@ -750,7 +757,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java
index e619ee4db74..0b66b18bf06 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java
@@ -83,7 +83,8 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart

+		implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

@@ -124,7 +125,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected IDirectEditorConfiguration configuration;

 

-

 	/**

 	 * @generated

 	 */

@@ -142,7 +142,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -258,8 +257,7 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 		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) {

@@ -290,8 +288,7 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 		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());

 	}

 

@@ -314,12 +311,13 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(

-								new RunnableWithResult.Impl<java.lang.Object>() {

+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()

+								.runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

 

 									@Override

 									public void run() {

-										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), UseCaseNameEditPartCN.this), (String) value));

+										setResult(parser.isValidEditString(ParserUtil.getParserAdapter(

+												getParserElement(), UseCaseNameEditPartCN.this), (String) value));

 									}

 								});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

@@ -443,13 +441,18 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 					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;

 				}

@@ -461,7 +464,8 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+							configuration.postEditAction(resolveSemanticElement(),

+									((ILabelEditorDialog) finalDialog).getValue());

 

 						}

 					};

@@ -487,9 +491,10 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 				@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();

@@ -546,8 +551,7 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

@@ -564,8 +568,7 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -575,13 +578,10 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	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);

 		}

 	}

@@ -693,11 +693,14 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	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);

 			}

 		}

 	}

@@ -710,8 +713,10 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	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;

 		}

@@ -732,11 +737,13 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 				@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 {

@@ -750,7 +757,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -767,7 +773,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -781,10 +786,10 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

+				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

@@ -801,7 +806,8 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 				}

 			}

 		}

-		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);

@@ -815,13 +821,11 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	private static final String ADD_PARENT_MODEL = "AddParentModel";

 

-

 	/**

 	 * @generated

 	 */

@@ -847,7 +851,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
index f1325c203ad..e62616a21da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -180,7 +180,8 @@ 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);

@@ -266,7 +267,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -361,14 +361,14 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		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));

 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -408,200 +408,159 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		/**

 		 * @generated

 		 */

-		public boolean canCreateComment_AnnotatedElementEdge(

-				Comment source, Element target) {

+		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);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateConstraint_ConstrainedElementEdge(

-				Constraint source, Element target) {

+		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 canCreateComponentRealization_Edge(

-				Package container, NamedElement source, NamedElement target) {

-			return canExistComponentRealization_Edge(

-					container, null, source, target);

+		public boolean canCreateComponentRealization_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistComponentRealization_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateInterfaceRealization_Edge(

-				Package container, NamedElement source, NamedElement target) {

-			return canExistInterfaceRealization_Edge(

-					container, null, source, target);

+		public boolean canCreateInterfaceRealization_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistInterfaceRealization_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateSubstitution_Edge(

-				Package container, NamedElement source, NamedElement target) {

-			return canExistSubstitution_Edge(

-					container, null, source, target);

+		public boolean canCreateSubstitution_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistSubstitution_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateRealization_Edge(

-				Package container, NamedElement source, NamedElement target) {

-			return canExistRealization_Edge(

-					container, null, source, target);

+		public boolean canCreateRealization_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistRealization_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateManifestation_Edge(

-				Package container, NamedElement source, NamedElement target) {

-			return canExistManifestation_Edge(

-					container, null, source, target);

+		public boolean canCreateManifestation_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistManifestation_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateAbstraction_Edge(

-				Package container, NamedElement source, NamedElement target) {

-			return canExistAbstraction_Edge(

-					container, null, source, target);

+		public boolean canCreateAbstraction_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistAbstraction_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateUsage_Edge(

-				Package container, NamedElement source, NamedElement target) {

-			return canExistUsage_Edge(

-					container, null, source, target);

+		public boolean canCreateUsage_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistUsage_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateDeployment_Edge(

-				Package container, NamedElement source, NamedElement target) {

-			return canExistDeployment_Edge(

-					container, null, source, target);

+		public boolean canCreateDeployment_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistDeployment_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateDependency_RoleBindingEdge(

-				Package container, NamedElement source, NamedElement target) {

-			return canExistDependency_RoleBindingEdge(

-					container, null, source, target);

+		public boolean canCreateDependency_RoleBindingEdge(Package container, NamedElement source,

+				NamedElement target) {

+			return canExistDependency_RoleBindingEdge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateDependency_Edge(

-				Package container, NamedElement source, NamedElement target) {

-			return canExistDependency_Edge(

-					container, null, source, target);

+		public boolean canCreateDependency_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistDependency_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateConnector_Edge(

-				StructuredClassifier container, ConnectorEnd source, ConnectorEnd target) {

-			return canExistConnector_Edge(

-					container, null, source, target);

+		public boolean canCreateConnector_Edge(StructuredClassifier container, ConnectorEnd source,

+				ConnectorEnd target) {

+			return canExistConnector_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateGeneralization_Edge(

-				Classifier container, Classifier source, Classifier target) {

-			return canExistGeneralization_Edge(

-					container, null, source, target);

+		public boolean canCreateGeneralization_Edge(Classifier container, Classifier source, Classifier target) {

+			return canExistGeneralization_Edge(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateTimeObservation_EventEdge(

-				TimeObservation source, NamedElement target) {

+		public boolean canCreateTimeObservation_EventEdge(TimeObservation source, NamedElement target) {

 			if (source != null) {

 				if (source.getEvent() != null) {

 					return false;

 				}

 			}

 

-			return canExistTimeObservation_EventEdge(

-					source, target);

+			return canExistTimeObservation_EventEdge(source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateDurationObservation_EventEdge(

-				DurationObservation source, NamedElement target) {

+		public boolean canCreateDurationObservation_EventEdge(DurationObservation source, NamedElement target) {

 			if (source != null) {

-				if (source.getEvents()

-						.size() >= 2

-						||

-						source.getEvents()

-								.contains(target)) {

+				if (source.getEvents().size() >= 2 || source.getEvents().contains(target)) {

 					return false;

 				}

 			}

 

-			return canExistDurationObservation_EventEdge(

-					source, target);

+			return canExistDurationObservation_EventEdge(source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateRepresentation_Edge(

-				InformationItem source, Classifier target) {

+		public boolean canCreateRepresentation_Edge(InformationItem source, Classifier target) {

 			if (source != null) {

-				if (source.getRepresenteds()

-						.contains(target)) {

+				if (source.getRepresenteds().contains(target)) {

 					return false;

 				}

 			}

 

-			return canExistRepresentation_Edge(

-					source, target);

+			return canExistRepresentation_Edge(source, target);

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canCreateInformationFlow_Edge(

-				Package container, NamedElement source, NamedElement target) {

-			return canExistInformationFlow_Edge(

-					container, null, source, target);

+		public boolean canCreateInformationFlow_Edge(Package container, NamedElement source, NamedElement target) {

+			return canExistInformationFlow_Edge(container, null, source, target);

 		}

 

 		/**

@@ -621,88 +580,86 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		/**

 		 * @generated

 		 */

-		public boolean canExistComment_AnnotatedElementEdge(

-				Comment source, Element target) {

+		public boolean canExistComment_AnnotatedElementEdge(Comment source, Element target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistConstraint_ConstrainedElementEdge(

-				Constraint source, Element target) {

+		public boolean canExistConstraint_ConstrainedElementEdge(Constraint source, Element target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistComponentRealization_Edge(

-				Package container, ComponentRealization linkInstance, NamedElement source, NamedElement target) {

+		public boolean canExistComponentRealization_Edge(Package container, ComponentRealization linkInstance,

+				NamedElement source, NamedElement target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistInterfaceRealization_Edge(

-				Package container, InterfaceRealization linkInstance, NamedElement source, NamedElement target) {

+		public boolean canExistInterfaceRealization_Edge(Package container, InterfaceRealization linkInstance,

+				NamedElement source, NamedElement target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistSubstitution_Edge(

-				Package container, Substitution linkInstance, NamedElement source, NamedElement target) {

+		public boolean canExistSubstitution_Edge(Package container, Substitution linkInstance, NamedElement source,

+				NamedElement target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistRealization_Edge(

-				Package container, Realization linkInstance, NamedElement source, NamedElement target) {

+		public boolean canExistRealization_Edge(Package container, Realization linkInstance, NamedElement source,

+				NamedElement target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistManifestation_Edge(

-				Package container, Manifestation linkInstance, NamedElement source, NamedElement target) {

+		public boolean canExistManifestation_Edge(Package container, Manifestation linkInstance, NamedElement source,

+				NamedElement target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistAbstraction_Edge(

-				Package container, Abstraction linkInstance, NamedElement source, NamedElement target) {

+		public boolean canExistAbstraction_Edge(Package container, Abstraction linkInstance, NamedElement source,

+				NamedElement target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistUsage_Edge(

-				Package container, Usage linkInstance, NamedElement source, NamedElement target) {

+		public boolean canExistUsage_Edge(Package container, Usage linkInstance, NamedElement source,

+				NamedElement target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistDeployment_Edge(

-				Package container, Deployment linkInstance, NamedElement source, NamedElement target) {

+		public boolean canExistDeployment_Edge(Package container, Deployment linkInstance, NamedElement source,

+				NamedElement target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistDependency_RoleBindingEdge(

-				Package container, Dependency linkInstance, NamedElement source, NamedElement target) {

+		public boolean canExistDependency_RoleBindingEdge(Package container, Dependency linkInstance,

+				NamedElement source, NamedElement target) {

 			try {

 				// RoleBinding source constraint

 				if ((source != null) && !(source instanceof CollaborationUse)) {

@@ -730,56 +687,51 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		/**

 		 * @generated

 		 */

-		public boolean canExistDependency_Edge(

-				Package container, Dependency linkInstance, NamedElement source, NamedElement target) {

+		public boolean canExistDependency_Edge(Package container, Dependency linkInstance, NamedElement source,

+				NamedElement target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistConnector_Edge(

-				StructuredClassifier container, Connector linkInstance, ConnectorEnd source, ConnectorEnd target) {

+		public boolean canExistConnector_Edge(StructuredClassifier container, Connector linkInstance,

+				ConnectorEnd source, ConnectorEnd target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistGeneralization_Edge(

-				Classifier container, Generalization linkInstance, Classifier source, Classifier target) {

+		public boolean canExistGeneralization_Edge(Classifier container, Generalization linkInstance, Classifier source,

+				Classifier target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistTimeObservation_EventEdge(

-				TimeObservation source, NamedElement target) {

+		public boolean canExistTimeObservation_EventEdge(TimeObservation source, NamedElement target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistDurationObservation_EventEdge(

-				DurationObservation source, NamedElement target) {

+		public boolean canExistDurationObservation_EventEdge(DurationObservation source, NamedElement target) {

 			return true;

 		}

 

 		/**

 		 * @generated

 		 */

-		public boolean canExistRepresentation_Edge(

-				InformationItem source, Classifier target) {

+		public boolean canExistRepresentation_Edge(InformationItem source, Classifier target) {

 			try {

 				// Represented InformationItem Target

 				if (target != null) {

-					if (!((target instanceof Class)

-							|| (target instanceof Interface)

-							|| (target instanceof InformationItem)

-							|| (target instanceof Signal) ||

-							(target instanceof Component))) {

+					if (!((target instanceof Class) || (target instanceof Interface)

+							|| (target instanceof InformationItem) || (target instanceof Signal)

+							|| (target instanceof Component))) {

 						return false;

 					}

 				}

@@ -793,23 +745,17 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		/**

 		 * @generated

 		 */

-		public boolean canExistInformationFlow_Edge(

-				Package container, InformationFlow linkInstance, NamedElement source, NamedElement target) {

+		public boolean canExistInformationFlow_Edge(Package container, InformationFlow linkInstance,

+				NamedElement source, NamedElement target) {

 			try {

-				// Information Flow source constraint

+				//Information Flow source constraint

 				if (source != null) {

-					if (!((source instanceof Actor)

-							|| (source instanceof Node)

-							|| (source instanceof UseCase)

-							|| (source instanceof Artifact)

-							|| (source instanceof Class)

-							|| (source instanceof Component)

-							|| (source instanceof Port)

-							|| (source instanceof Property)

-							|| (source instanceof Interface)

-							|| (source instanceof Package)

-							|| (source instanceof ActivityNode)

-							|| (source instanceof ActivityPartition) || (source instanceof InstanceSpecification))) {

+					if (!((source instanceof Actor) || (source instanceof Node) || (source instanceof UseCase)

+							|| (source instanceof Artifact) || (source instanceof Class)

+							|| (source instanceof Component) || (source instanceof Port) || (source instanceof Property)

+							|| (source instanceof Interface) || (source instanceof Package)

+							|| (source instanceof ActivityNode) || (source instanceof ActivityPartition)

+							|| (source instanceof InstanceSpecification))) {

 

 						return false;

 

@@ -823,20 +769,14 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 						}

 					}

 				}

-				// Information Flow target constraint

+				//Information Flow target constraint

 				if (target != null) {

-					if (!((target instanceof Actor)

-							|| (target instanceof Node)

-							|| (target instanceof UseCase)

-							|| (target instanceof Artifact)

-							|| (target instanceof Class)

-							|| (target instanceof Component)

-							|| (target instanceof Port)

-							|| (target instanceof Property)

-							|| (target instanceof Interface)

-							|| (target instanceof Package)

-							|| (target instanceof ActivityNode)

-							|| (target instanceof ActivityPartition) || (target instanceof InstanceSpecification))) {

+					if (!((target instanceof Actor) || (target instanceof Node) || (target instanceof UseCase)

+							|| (target instanceof Artifact) || (target instanceof Class)

+							|| (target instanceof Component) || (target instanceof Port) || (target instanceof Property)

+							|| (target instanceof Interface) || (target instanceof Package)

+							|| (target instanceof ActivityNode) || (target instanceof ActivityPartition)

+							|| (target instanceof InstanceSpecification))) {

 

 						return false;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java
index b2dea1947c5..c4740a9dc46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java
@@ -119,7 +119,8 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	 */

 	protected MessageFormat getEditorProcessor() {

 		if (editorProcessor == null) {

-			editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());

+			editorProcessor = new MessageFormat(

+					getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());

 		}

 		return editorProcessor;

 	}

@@ -156,7 +157,8 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	 */

 	protected MessageFormat getEditProcessor() {

 		if (editProcessor == null) {

-			editProcessor = new MessageFormat(getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern());

+			editProcessor = new MessageFormat(

+					getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern());

 		}

 		return editProcessor;

 	}

@@ -166,7 +168,8 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	 */

 	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();

+		return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0))

+				.toString();

 	}

 

 	/**

@@ -176,12 +179,8 @@ public class MessageFormatParser extends AbstractAttributeParser {
 		ParsePosition pos = new ParsePosition(0);

 		Object[] values = getEditProcessor().parse(editString, pos);

 		if (values == null) {

-			return new ParserEditStatus(

-					UMLDiagramEditorPlugin.ID,

-					IParserEditStatus.UNEDITABLE,

-					NLS.bind(

-							Messages.MessageFormatParser_InvalidInputError,

-							new Integer(pos.getErrorIndex())));

+			return new ParserEditStatus(UMLDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE,

+					NLS.bind(Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex())));

 		}

 		return validateNewValues(values);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java
index 8ba5f62b4ae..b9fb06b7e96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java
@@ -30,7 +30,6 @@ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider
 	 */

 	private IWorkbenchPart part;

 

-

 	/**

 	 * @generated

 	 */

@@ -39,20 +38,19 @@ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider
 		this.part = part;

 	}

 

-

 	/**

 	 * @generated

 	 */

 	public void buildContextMenu(final IMenuManager menu) {

 		getViewer().flush();

 		try {

-			TransactionUtil.getEditingDomain(

-					(EObject) getViewer().getContents().getModel()).runExclusive(new Runnable() {

+			TransactionUtil.getEditingDomain((EObject) getViewer().getContents().getModel())

+					.runExclusive(new Runnable() {

 

 						@Override

 						public void run() {

-							ContributionItemService.getInstance().contributeToPopupMenu(

-									DiagramEditorContextMenuProvider.this, part);

+							ContributionItemService.getInstance()

+									.contributeToPopupMenu(DiagramEditorContextMenuProvider.this, part);

 							menu.remove(ActionIds.ACTION_DELETE_FROM_MODEL);

 						}

 					});

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java
index 0db690f3b48..43dd0375601 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java
@@ -31,7 +31,6 @@ public class Messages extends NLS {
 	private Messages() {

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/ModelElementSelectionPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/ModelElementSelectionPage.java
index 6ec1dfefee8..1d0a298ec3d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/ModelElementSelectionPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/ModelElementSelectionPage.java
@@ -27,9 +27,6 @@ public class ModelElementSelectionPage extends DefaultModelElementSelectionPage
 		super(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory(), pageName);

 	}

 

-

-

-

 	/**

 	 * Override to provide custom model element description.

 	 * 

@@ -39,6 +36,4 @@ public class ModelElementSelectionPage extends DefaultModelElementSelectionPage
 		return Messages.ModelElementSelectionPageMessage;

 	}

 

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java
index e15a61e93fb..706ddbdf36d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java
@@ -28,8 +28,7 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation;
 /**

  * @generated

  */

-public class UMLCreationWizard

-		extends Wizard implements INewWizard {

+public class UMLCreationWizard extends Wizard implements INewWizard {

 

 	/**

 	 * @generated

@@ -103,8 +102,8 @@ public class UMLCreationWizard
 		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);

 	}

 

@@ -112,22 +111,19 @@ public class UMLCreationWizard
 	 * @generated

 	 */

 	public void addPages() {

-		diagramModelFilePage = new UMLCreationWizardPage(

-				"DiagramModelFile", getSelection(), "uml_csd"); //$NON-NLS-1$ //$NON-NLS-2$

+		diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), "uml_csd"); //$NON-NLS-1$ //$NON-NLS-2$

 		diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle);

 		diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription);

 		addPage(diagramModelFilePage);

 

-		domainModelFilePage = new UMLCreationWizardPage(

-				"DomainModelFile", getSelection(), "uml") { //$NON-NLS-1$ //$NON-NLS-2$

+		domainModelFilePage = new UMLCreationWizardPage("DomainModelFile", getSelection(), "uml") { //$NON-NLS-1$ //$NON-NLS-2$

 

 			@Override

 			public void setVisible(boolean visible) {

 				if (visible) {

 					String fileName = diagramModelFilePage.getFileName();

 					fileName = fileName.substring(0, fileName.length() - ".uml_csd".length()); //$NON-NLS-1$

-					setFileName(UMLDiagramEditorUtil.getUniqueFileName(

-							getContainerFullPath(), fileName, "uml")); //$NON-NLS-1$

+					setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), fileName, "uml")); //$NON-NLS-1$

 				}

 				super.setVisible(visible);

 			}

@@ -144,17 +140,15 @@ public class UMLCreationWizard
 		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());

 					}

 				}

 			}

@@ -165,12 +159,10 @@ public class UMLCreationWizard
 			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.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java
index 1fd5b710562..c14619c014e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java
@@ -32,8 +32,7 @@ public class UMLCreationWizardPage extends WizardNewFileCreationPage {
 	/**

 	 * @generated

 	 */

-	public UMLCreationWizardPage(String pageName,

-			IStructuredSelection selection, String fileExtension) {

+	public UMLCreationWizardPage(String pageName, IStructuredSelection selection, String fileExtension) {

 		super(pageName, selection);

 		this.fileExtension = fileExtension;

 	}

@@ -74,8 +73,7 @@ public class UMLCreationWizardPage extends WizardNewFileCreationPage {
 	 */

 	public void createControl(Composite parent) {

 		super.createControl(parent);

-		setFileName(UMLDiagramEditorUtil.getUniqueFileName(

-				getContainerFullPath(), getFileName(), getExtension()));

+		setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), getFileName(), getExtension()));

 		setPageComplete(validatePage());

 	}

 

@@ -88,8 +86,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.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java
index cda781b25c1..bf22e3ca8cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java
@@ -46,11 +46,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	public void initDiagramContent(Diagram diagram) {

 		if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(diagram.getType())) {

-			UMLDiagramEditorPlugin.getInstance().logError("Incorrect diagram passed as a parameter: " + diagram.getType());

+			UMLDiagramEditorPlugin.getInstance()

+					.logError("Incorrect diagram passed as a parameter: " + diagram.getType());

 			return;

 		}

 		if (false == diagram.getElement() instanceof Package) {

-			UMLDiagramEditorPlugin.getInstance().logError("Incorrect diagram element specified: " + diagram.getElement() + " instead of Package");

+			UMLDiagramEditorPlugin.getInstance()

+					.logError("Incorrect diagram element specified: " + diagram.getElement() + " instead of Package");

 			return;

 		}

 		createPackage_CompositeStructureDiagram_Children(diagram);

@@ -73,14 +75,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createActivity_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getActivity_Shape_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getActivity_Shape_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActivity_Shape_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivity_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createActivity_StructureCompartment_Children(getCompartment(view, ActivityCompositeCompartmentEditPart.VISUAL_ID));

+		createActivity_StructureCompartment_Children(

+				getCompartment(view, ActivityCompositeCompartmentEditPart.VISUAL_ID));

 	}

 

 	/**

@@ -88,14 +89,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInteraction_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInteraction_Shape_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getInteraction_Shape_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteraction_Shape_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteraction_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createInteraction_StructureCompartment_Children(getCompartment(view, InteractionCompositeCompartmentEditPart.VISUAL_ID));

+		createInteraction_StructureCompartment_Children(

+				getCompartment(view, InteractionCompositeCompartmentEditPart.VISUAL_ID));

 	}

 

 	/**

@@ -103,14 +103,14 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createProtocolStateMachine_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getProtocolStateMachine_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_Shape_OutgoingLinks(view));

 		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

 				.getProtocolStateMachine_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createProtocolStateMachine_StructureCompartment_Children(getCompartment(view, ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID));

+		createProtocolStateMachine_StructureCompartment_Children(

+				getCompartment(view, ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID));

 	}

 

 	/**

@@ -118,14 +118,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createStateMachine_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getStateMachine_Shape_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getStateMachine_Shape_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStateMachine_Shape_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachine_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createStateMachine_StructureCompartment_Children(getCompartment(view, StateMachineCompositeCompartmentEditPart.VISUAL_ID));

+		createStateMachine_StructureCompartment_Children(

+				getCompartment(view, StateMachineCompositeCompartmentEditPart.VISUAL_ID));

 	}

 

 	/**

@@ -133,14 +132,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createFunctionBehavior_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getFunctionBehavior_Shape_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getFunctionBehavior_Shape_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getFunctionBehavior_Shape_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehavior_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createFunctionBehavior_StructureCompartment_Children(getCompartment(view, FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID));

+		createFunctionBehavior_StructureCompartment_Children(

+				getCompartment(view, FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID));

 	}

 

 	/**

@@ -148,14 +146,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createOpaqueBehavior_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getOpaqueBehavior_Shape_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getOpaqueBehavior_Shape_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_Shape_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createOpaqueBehavior_StructureCompartment_Children(getCompartment(view, OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID));

+		createOpaqueBehavior_StructureCompartment_Children(

+				getCompartment(view, OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID));

 	}

 

 	/**

@@ -163,14 +160,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createComponent_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getComponent_Shape_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getComponent_Shape_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComponent_Shape_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponent_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createComponent_StructureCompartment_Children(getCompartment(view, ComponentCompositeCompartmentEditPart.VISUAL_ID));

+		createComponent_StructureCompartment_Children(

+				getCompartment(view, ComponentCompositeCompartmentEditPart.VISUAL_ID));

 	}

 

 	/**

@@ -178,10 +174,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDevice_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDevice_Shape_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getDevice_Shape_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDevice_Shape_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDevice_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -193,14 +187,14 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createExecutionEnvironment_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getExecutionEnvironment_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_Shape_OutgoingLinks(view));

 		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

 				.getExecutionEnvironment_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createExecutionEnvironment_StructureCompartment_Children(getCompartment(view, ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID));

+		createExecutionEnvironment_StructureCompartment_Children(

+				getCompartment(view, ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID));

 	}

 

 	/**

@@ -208,10 +202,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createNode_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getNode_Shape_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getNode_Shape_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getNode_Shape_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNode_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -223,10 +215,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createClass_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getClass_Shape_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getClass_Shape_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_Shape_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClass_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -238,9 +228,9 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createCollaboration_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getCollaboration_Shape_OutgoingLinks(view));

-		createCollaboration_StructureCompartment_Children(getCompartment(view, CollaborationCompositeCompartmentEditPart.VISUAL_ID));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCollaboration_Shape_OutgoingLinks(view));

+		createCollaboration_StructureCompartment_Children(

+				getCompartment(view, CollaborationCompositeCompartmentEditPart.VISUAL_ID));

 	}

 

 	/**

@@ -248,8 +238,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInterface_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInterface_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterface_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -257,8 +246,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createPrimitiveType_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getPrimitiveType_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -266,14 +254,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createEnumeration_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getEnumeration_Shape_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getEnumeration_Shape_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_Shape_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumeration_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createEnumeration_LiteralCompartment_Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));

+		createEnumeration_LiteralCompartment_Children(

+				getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));

 	}

 

 	/**

@@ -281,10 +268,11 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDataType_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDataType_Shape_OutgoingLinks(view));

-		createDataType_AttributeCompartment_Children(getCompartment(view, DataTypeAttributeCompartmentEditPart.VISUAL_ID));

-		createDataType_OperationCompartment_Children(getCompartment(view, DataTypeOperationCompartmentEditPart.VISUAL_ID));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_Shape_OutgoingLinks(view));

+		createDataType_AttributeCompartment_Children(

+				getCompartment(view, DataTypeAttributeCompartmentEditPart.VISUAL_ID));

+		createDataType_OperationCompartment_Children(

+				getCompartment(view, DataTypeOperationCompartmentEditPart.VISUAL_ID));

 	}

 

 	/**

@@ -292,8 +280,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createActor_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getActor_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActor_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -301,8 +288,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDeploymentSpecification_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDeploymentSpecification_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDeploymentSpecification_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -310,8 +296,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createArtifact_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getArtifact_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getArtifact_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -319,8 +304,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInformationItem_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInformationItem_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInformationItem_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -328,8 +312,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createSignal_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getSignal_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSignal_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -337,8 +320,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createUseCase_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getUseCase_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getUseCase_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -346,8 +328,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createSignalEvent_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getSignalEvent_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSignalEvent_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -355,8 +336,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createCallEvent_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getCallEvent_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCallEvent_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -364,8 +344,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createAnyReceiveEvent_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getAnyReceiveEvent_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAnyReceiveEvent_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -373,8 +352,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createChangeEvent_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getChangeEvent_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getChangeEvent_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -382,8 +360,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeEvent_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getTimeEvent_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeEvent_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -391,8 +368,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDurationObservation_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDurationObservation_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationObservation_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -400,8 +376,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeObservation_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getTimeObservation_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeObservation_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -409,8 +384,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralBoolean_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getLiteralBoolean_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralBoolean_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -418,8 +392,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralInteger_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getLiteralInteger_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralInteger_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -427,8 +400,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralNull_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getLiteralNull_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralNull_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -436,8 +408,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralString_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getLiteralString_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralString_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -445,8 +416,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralUnlimitedNatural_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getLiteralUnlimitedNatural_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralUnlimitedNatural_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -454,8 +424,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createStringExpression_PackagedElementShape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getStringExpression_PackagedElementShape_OutgoingLinks(view));

+		myLinkDescriptors

+				.addAll(UMLDiagramUpdater.INSTANCE.getStringExpression_PackagedElementShape_OutgoingLinks(view));

 	}

 

 	/**

@@ -463,8 +433,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createOpaqueExpression_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getOpaqueExpression_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOpaqueExpression_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -472,8 +441,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeExpression_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getTimeExpression_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeExpression_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -481,8 +449,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createExpression_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getExpression_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExpression_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -490,8 +457,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDuration_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDuration_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDuration_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -499,8 +465,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeInterval_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getTimeInterval_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeInterval_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -508,8 +473,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDurationInterval_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDurationInterval_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationInterval_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -517,8 +481,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInterval_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInterval_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterval_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -526,8 +489,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInstanceValue_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInstanceValue_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInstanceValue_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -535,8 +497,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createComment_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getComment_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -544,8 +505,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDurationConstraint_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDurationConstraint_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationConstraint_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -553,8 +513,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeConstraint_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getTimeConstraint_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeConstraint_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -562,8 +521,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createIntervalConstraint_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getIntervalConstraint_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getIntervalConstraint_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -571,8 +529,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInteractionConstraint_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInteractionConstraint_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteractionConstraint_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -580,8 +537,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createConstraint_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getConstraint_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -589,8 +545,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createPort_BehaviorShape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getPort_BehaviorShape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPort_BehaviorShape_OutgoingLinks(view));

 	}

 

 	/**

@@ -598,8 +553,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createPort_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getPort_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPort_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -607,8 +561,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createParameter_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getParameter_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getParameter_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -616,10 +569,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createProperty_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getProperty_Shape_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getProperty_Shape_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_Shape_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProperty_Shape_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -631,8 +582,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createConnectableElement_CollaborationRoleShape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getConnectableElement_CollaborationRoleShape_OutgoingLinks(view));

+		myLinkDescriptors

+				.addAll(UMLDiagramUpdater.INSTANCE.getConnectableElement_CollaborationRoleShape_OutgoingLinks(view));

 	}

 

 	/**

@@ -640,8 +591,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createCollaborationUse_Shape_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getCollaborationUse_Shape_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCollaborationUse_Shape_OutgoingLinks(view));

 	}

 

 	/**

@@ -649,14 +599,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createActivity_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getActivity_Shape_CN_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getActivity_Shape_CN_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActivity_Shape_CN_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivity_Shape_CN_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createActivity_StructureCompartment_CN_Children(getCompartment(view, ActivityCompositeCompartmentEditPartCN.VISUAL_ID));

+		createActivity_StructureCompartment_CN_Children(

+				getCompartment(view, ActivityCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -664,14 +613,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInteraction_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInteraction_Shape_CN_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getInteraction_Shape_CN_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteraction_Shape_CN_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteraction_Shape_CN_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createInteraction_StructureCompartment_CN_Children(getCompartment(view, InteractionCompositeCompartmentEditPartCN.VISUAL_ID));

+		createInteraction_StructureCompartment_CN_Children(

+				getCompartment(view, InteractionCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -679,14 +627,14 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createProtocolStateMachine_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getProtocolStateMachine_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_Shape_CN_OutgoingLinks(view));

 		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

 				.getProtocolStateMachine_Shape_CN_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createProtocolStateMachine_StructureCompartment_CN_Children(getCompartment(view, ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID));

+		createProtocolStateMachine_StructureCompartment_CN_Children(

+				getCompartment(view, ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -694,14 +642,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createStateMachine_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getStateMachine_Shape_CN_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getStateMachine_Shape_CN_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStateMachine_Shape_CN_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachine_Shape_CN_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createStateMachine_StructureCompartment_CN_Children(getCompartment(view, StateMachineCompositeCompartmentEditPartCN.VISUAL_ID));

+		createStateMachine_StructureCompartment_CN_Children(

+				getCompartment(view, StateMachineCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -709,14 +656,14 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createFunctionBehavior_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getFunctionBehavior_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getFunctionBehavior_Shape_CN_OutgoingLinks(view));

 		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

 				.getFunctionBehavior_Shape_CN_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createFunctionBehavior_StructureCompartment_CN_Children(getCompartment(view, FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID));

+		createFunctionBehavior_StructureCompartment_CN_Children(

+				getCompartment(view, FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -724,14 +671,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createOpaqueBehavior_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getOpaqueBehavior_Shape_CN_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getOpaqueBehavior_Shape_CN_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_Shape_CN_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_Shape_CN_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createOpaqueBehavior_StructureCompartment_CN_Children(getCompartment(view, OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID));

+		createOpaqueBehavior_StructureCompartment_CN_Children(

+				getCompartment(view, OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -739,14 +685,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createComponent_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getComponent_Shape_CN_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getComponent_Shape_CN_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComponent_Shape_CN_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponent_Shape_CN_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createComponent_StructureCompartment_CN_Children(getCompartment(view, ComponentCompositeCompartmentEditPartCN.VISUAL_ID));

+		createComponent_StructureCompartment_CN_Children(

+				getCompartment(view, ComponentCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -754,14 +699,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDevice_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDevice_Shape_CN_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getDevice_Shape_CN_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDevice_Shape_CN_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDevice_Shape_CN_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createDevice_StructureCompartment_CN_Children(getCompartment(view, DeviceCompositeCompartmentEditPartCN.VISUAL_ID));

+		createDevice_StructureCompartment_CN_Children(

+				getCompartment(view, DeviceCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -769,14 +713,14 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createExecutionEnvironment_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getExecutionEnvironment_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_Shape_CN_OutgoingLinks(view));

 		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

 				.getExecutionEnvironment_Shape_CN_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createExecutionEnvironment_StructureCompartment_CN_Children(getCompartment(view, ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID));

+		createExecutionEnvironment_StructureCompartment_CN_Children(

+				getCompartment(view, ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -784,10 +728,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createNode_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getNode_Shape_CN_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getNode_Shape_CN_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getNode_Shape_CN_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNode_Shape_CN_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -799,14 +741,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createClass_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getClass_Shape_CN_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getClass_Shape_CN_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_Shape_CN_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClass_Shape_CN_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createClass_StructureCompartment_CN_Children(getCompartment(view, ClassCompositeCompartmentEditPartCN.VISUAL_ID));

+		createClass_StructureCompartment_CN_Children(

+				getCompartment(view, ClassCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -814,9 +755,9 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createCollaboration_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getCollaboration_Shape_CN_OutgoingLinks(view));

-		createCollaboration_StructureCompartment_CN_Children(getCompartment(view, CollaborationCompositeCompartmentEditPartCN.VISUAL_ID));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCollaboration_Shape_CN_OutgoingLinks(view));

+		createCollaboration_StructureCompartment_CN_Children(

+				getCompartment(view, CollaborationCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -824,8 +765,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInterface_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInterface_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterface_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -833,8 +773,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createPrimitiveType_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getPrimitiveType_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -842,14 +781,13 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createEnumeration_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getEnumeration_Shape_CN_OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getEnumeration_Shape_CN_SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_Shape_CN_OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumeration_Shape_CN_SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

-		createEnumeration_LiteralCompartment_CN_Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));

+		createEnumeration_LiteralCompartment_CN_Children(

+				getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -857,10 +795,11 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDataType_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDataType_Shape_CN_OutgoingLinks(view));

-		createDataType_AttributeCompartment_CN_Children(getCompartment(view, DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));

-		createDataType_OperationCompartment_CN_Children(getCompartment(view, DataTypeOperationCompartmentEditPartCN.VISUAL_ID));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_Shape_CN_OutgoingLinks(view));

+		createDataType_AttributeCompartment_CN_Children(

+				getCompartment(view, DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));

+		createDataType_OperationCompartment_CN_Children(

+				getCompartment(view, DataTypeOperationCompartmentEditPartCN.VISUAL_ID));

 	}

 

 	/**

@@ -868,8 +807,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createActor_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getActor_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActor_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -877,8 +815,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDeploymentSpecification_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDeploymentSpecification_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDeploymentSpecification_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -886,8 +823,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createArtifact_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getArtifact_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getArtifact_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -895,8 +831,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInformationItem_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInformationItem_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInformationItem_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -904,8 +839,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createSignal_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getSignal_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSignal_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -913,8 +847,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createUseCase_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getUseCase_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getUseCase_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -922,8 +855,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createComment_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getComment_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -931,8 +863,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDurationConstraint_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDurationConstraint_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationConstraint_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -940,8 +871,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeConstraint_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getTimeConstraint_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeConstraint_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -949,8 +879,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createIntervalConstraint_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getIntervalConstraint_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getIntervalConstraint_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -958,8 +887,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInteractionConstraint_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInteractionConstraint_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteractionConstraint_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -967,8 +895,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createConstraint_Shape_CN_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getConstraint_Shape_CN_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_Shape_CN_OutgoingLinks(view));

 	}

 

 	/**

@@ -976,8 +903,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createProperty_AttributeLabel_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getProperty_AttributeLabel_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_AttributeLabel_OutgoingLinks(view));

 	}

 

 	/**

@@ -985,8 +911,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createOperation_OperationLabel_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getOperation_OperationLabel_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOperation_OperationLabel_OutgoingLinks(view));

 	}

 

 	/**

@@ -994,8 +919,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createEnumerationLiteral_LiteralLabel_Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getEnumerationLiteral_LiteralLabel_OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumerationLiteral_LiteralLabel_OutgoingLinks(view));

 	}

 

 	/**

@@ -1344,7 +1268,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createNode(View parentView, UMLNodeDescriptor nodeDescriptor) {

 		final String nodeType = UMLVisualIDRegistry.getType(nodeDescriptor.getVisualID());

-		Node node = ViewService.createNode(parentView, nodeDescriptor.getModelElement(), nodeType, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+		Node node = ViewService.createNode(parentView, nodeDescriptor.getModelElement(), nodeType,

+				UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

 		switch (nodeDescriptor.getVisualID()) {

 		case ActivityCompositeEditPart.VISUAL_ID:

 			createActivity_Shape_Children(node);

@@ -1616,11 +1541,13 @@ public class UMLDiagramContentInitializer {
 			Collection additionalDescriptors = new LinkedList();

 			for (Iterator it = myLinkDescriptors.iterator(); it.hasNext();) {

 				UMLLinkDescriptor nextLinkDescriptor = (UMLLinkDescriptor) it.next();

-				if (!myDomain2NotationMap.containsKey(nextLinkDescriptor.getSource()) || !myDomain2NotationMap.containsKey(nextLinkDescriptor.getDestination())) {

+				if (!myDomain2NotationMap.containsKey(nextLinkDescriptor.getSource())

+						|| !myDomain2NotationMap.containsKey(nextLinkDescriptor.getDestination())) {

 					continue;

 				}

 				final String linkType = UMLVisualIDRegistry.getType(nextLinkDescriptor.getVisualID());

-				Edge edge = ViewService.getInstance().createEdge(nextLinkDescriptor.getSemanticAdapter(), diagram, linkType, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				Edge edge = ViewService.getInstance().createEdge(nextLinkDescriptor.getSemanticAdapter(), diagram,

+						linkType, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

 				if (edge != null) {

 					edge.setSource((View) myDomain2NotationMap.get(nextLinkDescriptor.getSource()));

 					edge.setTarget((View) myDomain2NotationMap.get(nextLinkDescriptor.getDestination()));

@@ -1631,56 +1558,52 @@ public class UMLDiagramContentInitializer {
 					continueLinkCreation = true;

 					switch (nextLinkDescriptor.getVisualID()) {

 					case ComponentRealizationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getComponentRealization_Edge_OutgoingLinks(edge));

+						additionalDescriptors

+								.addAll(UMLDiagramUpdater.INSTANCE.getComponentRealization_Edge_OutgoingLinks(edge));

 						break;

 					case InterfaceRealizationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getInterfaceRealization_Edge_OutgoingLinks(edge));

+						additionalDescriptors

+								.addAll(UMLDiagramUpdater.INSTANCE.getInterfaceRealization_Edge_OutgoingLinks(edge));

 						break;

 					case SubstitutionEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getSubstitution_Edge_OutgoingLinks(edge));

+						additionalDescriptors

+								.addAll(UMLDiagramUpdater.INSTANCE.getSubstitution_Edge_OutgoingLinks(edge));

 						break;

 					case RealizationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getRealization_Edge_OutgoingLinks(edge));

+						additionalDescriptors

+								.addAll(UMLDiagramUpdater.INSTANCE.getRealization_Edge_OutgoingLinks(edge));

 						break;

 					case ManifestationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getManifestation_Edge_OutgoingLinks(edge));

+						additionalDescriptors

+								.addAll(UMLDiagramUpdater.INSTANCE.getManifestation_Edge_OutgoingLinks(edge));

 						break;

 					case AbstractionEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getAbstraction_Edge_OutgoingLinks(edge));

+						additionalDescriptors

+								.addAll(UMLDiagramUpdater.INSTANCE.getAbstraction_Edge_OutgoingLinks(edge));

 						break;

 					case UsageEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getUsage_Edge_OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getUsage_Edge_OutgoingLinks(edge));

 						break;

 					case DeploymentEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getDeployment_Edge_OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDeployment_Edge_OutgoingLinks(edge));

 						break;

 					case RoleBindingEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getDependency_RoleBindingEdge_OutgoingLinks(edge));

+						additionalDescriptors

+								.addAll(UMLDiagramUpdater.INSTANCE.getDependency_RoleBindingEdge_OutgoingLinks(edge));

 						break;

 					case DependencyEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getDependency_Edge_OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_Edge_OutgoingLinks(edge));

 						break;

 					case ConnectorEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getConnector_Edge_OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConnector_Edge_OutgoingLinks(edge));

 						break;

 					case GeneralizationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getGeneralization_Edge_OutgoingLinks(edge));

+						additionalDescriptors

+								.addAll(UMLDiagramUpdater.INSTANCE.getGeneralization_Edge_OutgoingLinks(edge));

 						break;

 					case InformationFlowEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getInformationFlow_Edge_OutgoingLinks(edge));

+						additionalDescriptors

+								.addAll(UMLDiagramUpdater.INSTANCE.getInformationFlow_Edge_OutgoingLinks(edge));

 						break;

 					}

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
index 26ab07a93bc..f6829e552f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
@@ -61,8 +61,7 @@ import org.eclipse.ui.part.ShowInContext;
 /**

  * @generated

  */

-public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderChangeListener,

-		IGotoMarker {

+public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderChangeListener, IGotoMarker {

 

 	/**

 	 * @generated

@@ -74,7 +73,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	 */

 	public static final String CONTEXT_ID = "org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"; //$NON-NLS-1$

 

-

 	/**

 	 * @generated

 	 */

@@ -154,7 +152,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 		return UMLDiagramEditorPlugin.ID;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -211,19 +208,17 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());

 	}

 

-

 	/**

 	 * @generated

 	 */

 	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());

 	}

 

-

-

 	/**

 	 * @generated

 	 */

@@ -327,8 +322,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 		return getEditDomain().getPaletteViewer();

 	}

 

-

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java
index ea6da44a20a..7edcd6d6a9e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java
@@ -116,11 +116,11 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 	 * @generated

 	 */

 	public IPreferenceStore getPreferenceStore() {

-		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();

+		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault()

+				.getPreferenceStore();

 		return store;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -132,11 +132,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;

 	}

@@ -167,8 +165,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());

 		}

@@ -198,8 +196,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.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java
index 0f4700b2e51..4d2abc9877a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java
@@ -114,7 +114,6 @@ public class UMLDiagramEditorUtil {
 				DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE);

 	}

 

-

 	/**

 	 * Runs the wizard in a dialog.

 	 * 

@@ -144,15 +143,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,

-						CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				Diagram diagram = ViewService.createDiagram(model, CompositeStructureDiagramEditPart.MODEL_ID,

+						UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

 				if (diagram != null) {

 					diagramResource.getContents().add(diagram);

 					diagram.setName(diagramName);

@@ -160,8 +160,10 @@ public class UMLDiagramEditorUtil {
 				}

 

 				try {

-					modelResource.save(org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil.getSaveOptions());

-					diagramResource.save(org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil.getSaveOptions());

+					modelResource

+							.save(org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil.getSaveOptions());

+					diagramResource

+							.save(org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil.getSaveOptions());

 				} catch (IOException e) {

 

 					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$

@@ -170,7 +172,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$

 		}

@@ -180,23 +183,21 @@ public class UMLDiagramEditorUtil {
 	}

 

 	/**

-	 * Create a new instance of domain element associated with canvas.

-	 * <!-- begin-user-doc -->

+	* Create a new instance of domain element associated with canvas.

+	* <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

+	* @generated

+	*/

 	private static Package createInitialModel() {

 		return UMLFactory.eINSTANCE.createPackage();

 	}

 

 	/**

-	 * Store model element in the resource.

-	 * <!-- begin-user-doc -->

+	* Store model element in the resource.

+	* <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

+	* @generated

+	*/

 	private static void attachModelToResource(Package model, Resource resource) {

 		resource.getContents().add(model);

 	}

@@ -216,14 +217,16 @@ 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));

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	private static int findElementsInDiagramByID(DiagramEditPart diagramPart, EObject element, List<EditPart> editPartCollector) {

+	private static int findElementsInDiagramByID(DiagramEditPart diagramPart, EObject element,

+			List<EditPart> editPartCollector) {

 		IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer) diagramPart.getViewer();

 		final int intialNumOfEditParts = editPartCollector.size();

 

@@ -264,7 +267,8 @@ public class UMLDiagramEditorUtil {
 	/**

 	 * @generated

 	 */

-	public static View findView(DiagramEditPart diagramEditPart, EObject targetElement, LazyElement2ViewMap lazyElement2ViewMap) {

+	public static View findView(DiagramEditPart diagramEditPart, EObject targetElement,

+			LazyElement2ViewMap lazyElement2ViewMap) {

 		boolean hasStructuralURI = false;

 		if (targetElement.eResource() instanceof XMLResource) {

 			hasStructuralURI = ((XMLResource) targetElement.eResource()).getID(targetElement) == null;

@@ -335,12 +339,14 @@ public class UMLDiagramEditorUtil {
 		/**

 		 * @generated

 		 */

-		private static boolean buildElement2ViewMap(View parentView, Map<EObject, View> element2ViewMap, Set<? extends EObject> elements) {

+		private static boolean buildElement2ViewMap(View parentView, Map<EObject, View> element2ViewMap,

+				Set<? extends EObject> elements) {

 			if (elements.size() == element2ViewMap.size()) {

 				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;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
index b3217b72e92..8699f6fcdf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
@@ -116,7 +116,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	protected UMLDiagramUpdater() {

-		// to prevent instantiation allowing the override

+		//to prevent instantiation allowing the override

 	}

 

 	/**

@@ -254,8 +254,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Package modelElement = (Package) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getPackagedElements()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

 			PackageableElement childElement = (PackageableElement) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ActivityCompositeEditPart.VISUAL_ID.equals(visualID)) {

@@ -431,8 +430,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)) {

@@ -440,8 +438,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 (DurationConstraintEditPart.VISUAL_ID.equals(visualID)) {

@@ -477,8 +474,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Activity modelElement = (Activity) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -486,8 +482,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -507,8 +502,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Interaction modelElement = (Interaction) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -516,8 +510,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -537,8 +530,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -546,8 +538,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -567,8 +558,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		StateMachine modelElement = (StateMachine) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -576,8 +566,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -597,8 +586,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -606,8 +594,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -627,8 +614,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -636,8 +622,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -657,8 +642,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Component modelElement = (Component) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -678,8 +662,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Device modelElement = (Device) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -699,8 +682,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -720,8 +702,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Node modelElement = (Node) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -741,8 +722,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Class modelElement = (Class) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -762,8 +742,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Enumeration modelElement = (Enumeration) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedLiterals()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

 			EnumerationLiteral childElement = (EnumerationLiteral) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (EnumerationLiteralEditPartCLN.VISUAL_ID.equals(visualID)) {

@@ -791,8 +770,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Activity modelElement = (Activity) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -800,8 +778,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -821,8 +798,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Interaction modelElement = (Interaction) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -830,8 +806,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -851,8 +826,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -860,8 +834,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -881,8 +854,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		StateMachine modelElement = (StateMachine) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -890,8 +862,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -911,8 +882,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -920,8 +890,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -941,8 +910,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -950,8 +918,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -971,8 +938,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Component modelElement = (Component) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -992,8 +958,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Device modelElement = (Device) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -1013,8 +978,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -1034,8 +998,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Node modelElement = (Node) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -1055,8 +1018,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Class modelElement = (Class) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PortEditPart.VISUAL_ID.equals(visualID)) {

@@ -1076,8 +1038,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Enumeration modelElement = (Enumeration) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedLiterals()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

 			EnumerationLiteral childElement = (EnumerationLiteral) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (EnumerationLiteralEditPartCLN.VISUAL_ID.equals(visualID)) {

@@ -1101,8 +1062,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		DataType modelElement = (DataType) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyEditPartCLN.VISUAL_ID.equals(visualID)) {

@@ -1126,8 +1086,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		DataType modelElement = (DataType) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedOperations()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) {

 			Operation childElement = (Operation) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (OperationEditPartCLN.VISUAL_ID.equals(visualID)) {

@@ -1151,8 +1110,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		DataType modelElement = (DataType) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyEditPartCLN.VISUAL_ID.equals(visualID)) {

@@ -1176,8 +1134,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		DataType modelElement = (DataType) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedOperations()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) {

 			Operation childElement = (Operation) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (OperationEditPartCLN.VISUAL_ID.equals(visualID)) {

@@ -1201,8 +1158,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Enumeration modelElement = (Enumeration) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedLiterals()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

 			EnumerationLiteral childElement = (EnumerationLiteral) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (EnumerationLiteralEditPartCLN.VISUAL_ID.equals(visualID)) {

@@ -1226,8 +1182,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Enumeration modelElement = (Enumeration) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedLiterals()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

 			EnumerationLiteral childElement = (EnumerationLiteral) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (EnumerationLiteralEditPartCLN.VISUAL_ID.equals(visualID)) {

@@ -1251,8 +1206,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Activity modelElement = (Activity) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -1260,8 +1214,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1269,8 +1222,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1278,8 +1230,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1371,8 +1322,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)) {

@@ -1380,8 +1330,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1421,8 +1370,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Interaction modelElement = (Interaction) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -1430,8 +1378,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1439,8 +1386,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1448,8 +1394,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1541,8 +1486,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)) {

@@ -1550,8 +1494,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1591,8 +1534,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -1600,8 +1542,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1609,8 +1550,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1618,8 +1558,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1711,8 +1650,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)) {

@@ -1720,8 +1658,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1761,8 +1698,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		StateMachine modelElement = (StateMachine) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -1770,8 +1706,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1779,8 +1714,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1788,8 +1722,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1881,8 +1814,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)) {

@@ -1890,8 +1822,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1931,8 +1862,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		FunctionBehavior modelElement = (FunctionBehavior) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -1940,8 +1870,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1949,8 +1878,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -1958,8 +1886,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2051,8 +1978,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)) {

@@ -2060,8 +1986,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2101,8 +2026,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		OpaqueBehavior modelElement = (OpaqueBehavior) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -2110,8 +2034,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2119,8 +2042,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2128,8 +2050,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2221,8 +2142,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)) {

@@ -2230,8 +2150,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2271,8 +2190,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Component modelElement = (Component) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2280,8 +2198,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2289,8 +2206,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2382,8 +2298,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)) {

@@ -2391,8 +2306,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2432,8 +2346,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Device modelElement = (Device) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2441,8 +2354,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2450,8 +2362,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2543,8 +2454,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)) {

@@ -2552,8 +2462,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2593,8 +2502,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2602,8 +2510,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2611,8 +2518,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2704,8 +2610,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)) {

@@ -2713,8 +2618,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2754,8 +2658,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Node modelElement = (Node) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2763,8 +2666,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2772,8 +2674,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2865,8 +2766,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)) {

@@ -2874,8 +2774,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2915,8 +2814,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Class modelElement = (Class) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2928,8 +2826,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -2937,8 +2834,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3030,8 +2926,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)) {

@@ -3039,8 +2934,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3080,8 +2974,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Collaboration modelElement = (Collaboration) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3089,8 +2982,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3098,8 +2990,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)) {

@@ -3107,8 +2998,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getRoles()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getRoles().iterator(); it.hasNext();) {

 			ConnectableElement childElement = (ConnectableElement) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationRoleEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3116,8 +3006,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3157,8 +3046,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Activity modelElement = (Activity) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -3166,8 +3054,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3175,8 +3062,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3184,8 +3070,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3277,8 +3162,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)) {

@@ -3286,8 +3170,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3327,8 +3210,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Interaction modelElement = (Interaction) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -3336,8 +3218,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3345,8 +3226,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3354,8 +3234,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3447,8 +3326,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)) {

@@ -3456,8 +3334,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3497,8 +3374,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -3506,8 +3382,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3515,8 +3390,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3524,8 +3398,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3617,8 +3490,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)) {

@@ -3626,8 +3498,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3667,8 +3538,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		StateMachine modelElement = (StateMachine) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -3676,8 +3546,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3685,8 +3554,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3694,8 +3562,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3787,8 +3654,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)) {

@@ -3796,8 +3662,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3837,8 +3702,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		FunctionBehavior modelElement = (FunctionBehavior) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -3846,8 +3710,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3855,8 +3718,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3864,8 +3726,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -3957,8 +3818,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)) {

@@ -3966,8 +3826,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4007,8 +3866,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		OpaqueBehavior modelElement = (OpaqueBehavior) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (ParameterEditPart.VISUAL_ID.equals(visualID)) {

@@ -4016,8 +3874,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4025,8 +3882,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4034,8 +3890,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4127,8 +3982,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)) {

@@ -4136,8 +3990,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4177,8 +4030,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Component modelElement = (Component) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4186,8 +4038,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4195,8 +4046,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4288,8 +4138,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)) {

@@ -4297,8 +4146,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4338,8 +4186,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Device modelElement = (Device) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4347,8 +4194,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4356,8 +4202,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4449,8 +4294,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)) {

@@ -4458,8 +4302,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4499,8 +4342,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4508,8 +4350,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4517,8 +4358,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4610,8 +4450,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)) {

@@ -4619,8 +4458,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4660,8 +4498,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Node modelElement = (Node) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4669,8 +4506,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4678,8 +4514,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4771,8 +4606,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)) {

@@ -4780,8 +4614,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4821,8 +4654,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Class modelElement = (Class) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4830,8 +4662,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4839,8 +4670,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 (ActivityCompositeEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4932,8 +4762,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)) {

@@ -4941,8 +4770,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)) {

@@ -4982,8 +4810,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Collaboration modelElement = (Collaboration) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (PropertyPartEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -4991,8 +4818,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationUseEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -5000,8 +4826,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)) {

@@ -5009,8 +4834,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getRoles()

-				.iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getRoles().iterator(); it.hasNext();) {

 			ConnectableElement childElement = (ConnectableElement) it.next();

 			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (CollaborationRoleEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -5018,8 +4842,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 (DurationConstraintEditPartCN.VISUAL_ID.equals(visualID)) {

@@ -5054,8 +4877,6 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		return customUpdater.getSemanticChildren(view);

 	}

 

-

-

 	/**

 	 * @generated

 	 */

@@ -5268,7 +5089,6 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		return Collections.emptyList();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -5479,7 +5299,6 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		return Collections.emptyList();

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -6608,10 +6427,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getActivity_Shape_IncomingLinks(View view) {

 		Activity modelElement = (Activity) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6635,10 +6456,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getInteraction_Shape_IncomingLinks(View view) {

 		Interaction modelElement = (Interaction) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6662,10 +6485,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getProtocolStateMachine_Shape_IncomingLinks(View view) {

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6689,10 +6514,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getStateMachine_Shape_IncomingLinks(View view) {

 		StateMachine modelElement = (StateMachine) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6716,10 +6543,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getFunctionBehavior_Shape_IncomingLinks(View view) {

 		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6743,10 +6572,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getOpaqueBehavior_Shape_IncomingLinks(View view) {

 		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6770,10 +6601,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getComponent_Shape_IncomingLinks(View view) {

 		Component modelElement = (Component) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6797,10 +6630,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6824,10 +6659,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6851,10 +6688,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6878,10 +6717,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getClass_Shape_IncomingLinks(View view) {

 		Class modelElement = (Class) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6905,10 +6746,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getCollaboration_Shape_IncomingLinks(View view) {

 		Collaboration modelElement = (Collaboration) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6932,10 +6775,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getInterface_Shape_IncomingLinks(View view) {

 		Interface modelElement = (Interface) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6959,10 +6804,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getPrimitiveType_Shape_IncomingLinks(View view) {

 		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -6986,10 +6833,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getEnumeration_Shape_IncomingLinks(View view) {

 		Enumeration modelElement = (Enumeration) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7013,10 +6862,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDataType_Shape_IncomingLinks(View view) {

 		DataType modelElement = (DataType) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7040,10 +6891,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getActor_Shape_IncomingLinks(View view) {

 		Actor modelElement = (Actor) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7067,10 +6920,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7094,10 +6949,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7121,10 +6978,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getInformationItem_Shape_IncomingLinks(View view) {

 		InformationItem modelElement = (InformationItem) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7148,10 +7007,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getSignal_Shape_IncomingLinks(View view) {

 		Signal modelElement = (Signal) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7175,10 +7036,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getUseCase_Shape_IncomingLinks(View view) {

 		UseCase modelElement = (UseCase) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7202,10 +7065,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getSignalEvent_Shape_IncomingLinks(View view) {

 		SignalEvent modelElement = (SignalEvent) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7227,10 +7092,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getCallEvent_Shape_IncomingLinks(View view) {

 		CallEvent modelElement = (CallEvent) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7252,10 +7119,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getAnyReceiveEvent_Shape_IncomingLinks(View view) {

 		AnyReceiveEvent modelElement = (AnyReceiveEvent) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7277,10 +7146,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getChangeEvent_Shape_IncomingLinks(View view) {

 		ChangeEvent modelElement = (ChangeEvent) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7302,10 +7173,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getTimeEvent_Shape_IncomingLinks(View view) {

 		TimeEvent modelElement = (TimeEvent) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7327,10 +7200,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDurationObservation_Shape_IncomingLinks(View view) {

 		DurationObservation modelElement = (DurationObservation) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7352,10 +7227,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getTimeObservation_Shape_IncomingLinks(View view) {

 		TimeObservation modelElement = (TimeObservation) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7377,10 +7254,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getLiteralBoolean_Shape_IncomingLinks(View view) {

 		LiteralBoolean modelElement = (LiteralBoolean) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7402,10 +7281,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getLiteralInteger_Shape_IncomingLinks(View view) {

 		LiteralInteger modelElement = (LiteralInteger) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7427,10 +7308,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getLiteralNull_Shape_IncomingLinks(View view) {

 		LiteralNull modelElement = (LiteralNull) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7452,10 +7335,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getLiteralString_Shape_IncomingLinks(View view) {

 		LiteralString modelElement = (LiteralString) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7477,10 +7362,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getLiteralUnlimitedNatural_Shape_IncomingLinks(View view) {

 		LiteralUnlimitedNatural modelElement = (LiteralUnlimitedNatural) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7502,10 +7389,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getStringExpression_PackagedElementShape_IncomingLinks(View view) {

 		StringExpression modelElement = (StringExpression) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7527,10 +7416,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getOpaqueExpression_Shape_IncomingLinks(View view) {

 		OpaqueExpression modelElement = (OpaqueExpression) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7552,10 +7443,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getTimeExpression_Shape_IncomingLinks(View view) {

 		TimeExpression modelElement = (TimeExpression) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7577,10 +7470,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getExpression_Shape_IncomingLinks(View view) {

 		Expression modelElement = (Expression) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7602,10 +7497,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDuration_Shape_IncomingLinks(View view) {

 		Duration modelElement = (Duration) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7627,10 +7524,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getTimeInterval_Shape_IncomingLinks(View view) {

 		TimeInterval modelElement = (TimeInterval) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7652,10 +7551,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDurationInterval_Shape_IncomingLinks(View view) {

 		DurationInterval modelElement = (DurationInterval) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7677,10 +7578,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getInterval_Shape_IncomingLinks(View view) {

 		Interval modelElement = (Interval) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7702,10 +7605,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getInstanceValue_Shape_IncomingLinks(View view) {

 		InstanceValue modelElement = (InstanceValue) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7727,10 +7632,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());

+		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;

 	}

 

@@ -7739,10 +7646,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDurationConstraint_Shape_IncomingLinks(View view) {

 		DurationConstraint modelElement = (DurationConstraint) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7764,10 +7673,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getTimeConstraint_Shape_IncomingLinks(View view) {

 		TimeConstraint modelElement = (TimeConstraint) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7789,10 +7700,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getIntervalConstraint_Shape_IncomingLinks(View view) {

 		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7814,10 +7727,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getInteractionConstraint_Shape_IncomingLinks(View view) {

 		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7839,10 +7754,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7864,10 +7781,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getPort_BehaviorShape_IncomingLinks(View view) {

 		Port modelElement = (Port) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7889,10 +7808,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getPort_Shape_IncomingLinks(View view) {

 		Port modelElement = (Port) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7914,10 +7835,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getParameter_Shape_IncomingLinks(View view) {

 		Parameter modelElement = (Parameter) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7939,10 +7862,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getProperty_Shape_IncomingLinks(View view) {

 		Property modelElement = (Property) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7964,10 +7889,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getConnectableElement_CollaborationRoleShape_IncomingLinks(View view) {

 		ConnectableElement modelElement = (ConnectableElement) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -7989,10 +7916,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getCollaborationUse_Shape_IncomingLinks(View view) {

 		CollaborationUse modelElement = (CollaborationUse) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8014,10 +7943,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getActivity_Shape_CN_IncomingLinks(View view) {

 		Activity modelElement = (Activity) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8041,10 +7972,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getInteraction_Shape_CN_IncomingLinks(View view) {

 		Interaction modelElement = (Interaction) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8068,10 +8001,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getProtocolStateMachine_Shape_CN_IncomingLinks(View view) {

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8095,10 +8030,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getStateMachine_Shape_CN_IncomingLinks(View view) {

 		StateMachine modelElement = (StateMachine) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8122,10 +8059,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getFunctionBehavior_Shape_CN_IncomingLinks(View view) {

 		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8149,10 +8088,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getOpaqueBehavior_Shape_CN_IncomingLinks(View view) {

 		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8176,10 +8117,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getComponent_Shape_CN_IncomingLinks(View view) {

 		Component modelElement = (Component) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8203,10 +8146,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8230,10 +8175,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8257,10 +8204,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8284,10 +8233,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getClass_Shape_CN_IncomingLinks(View view) {

 		Class modelElement = (Class) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8311,10 +8262,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getCollaboration_Shape_CN_IncomingLinks(View view) {

 		Collaboration modelElement = (Collaboration) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8338,10 +8291,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getInterface_Shape_CN_IncomingLinks(View view) {

 		Interface modelElement = (Interface) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8365,10 +8320,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getPrimitiveType_Shape_CN_IncomingLinks(View view) {

 		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8392,10 +8349,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getEnumeration_Shape_CN_IncomingLinks(View view) {

 		Enumeration modelElement = (Enumeration) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8419,10 +8378,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDataType_Shape_CN_IncomingLinks(View view) {

 		DataType modelElement = (DataType) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8446,10 +8407,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getActor_Shape_CN_IncomingLinks(View view) {

 		Actor modelElement = (Actor) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8473,10 +8436,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8500,10 +8465,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8527,10 +8494,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getInformationItem_Shape_CN_IncomingLinks(View view) {

 		InformationItem modelElement = (InformationItem) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8554,10 +8523,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getSignal_Shape_CN_IncomingLinks(View view) {

 		Signal modelElement = (Signal) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8581,10 +8552,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getUseCase_Shape_CN_IncomingLinks(View view) {

 		UseCase modelElement = (UseCase) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8608,10 +8581,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());

+		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;

 	}

 

@@ -8620,10 +8595,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDurationConstraint_Shape_CN_IncomingLinks(View view) {

 		DurationConstraint modelElement = (DurationConstraint) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8645,10 +8622,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getTimeConstraint_Shape_CN_IncomingLinks(View view) {

 		TimeConstraint modelElement = (TimeConstraint) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8670,10 +8649,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getIntervalConstraint_Shape_CN_IncomingLinks(View view) {

 		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8695,10 +8676,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getInteractionConstraint_Shape_CN_IncomingLinks(View view) {

 		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8720,10 +8703,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8766,10 +8751,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getComponentRealization_Edge_IncomingLinks(View view) {

 		ComponentRealization modelElement = (ComponentRealization) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8791,10 +8778,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getInterfaceRealization_Edge_IncomingLinks(View view) {

 		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8816,10 +8805,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getSubstitution_Edge_IncomingLinks(View view) {

 		Substitution modelElement = (Substitution) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8841,10 +8832,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getRealization_Edge_IncomingLinks(View view) {

 		Realization modelElement = (Realization) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8866,10 +8859,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8891,10 +8886,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getAbstraction_Edge_IncomingLinks(View view) {

 		Abstraction modelElement = (Abstraction) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8916,10 +8913,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getUsage_Edge_IncomingLinks(View view) {

 		Usage modelElement = (Usage) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8941,10 +8940,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8966,10 +8967,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getDependency_RoleBindingEdge_IncomingLinks(View view) {

 		Dependency modelElement = (Dependency) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -8991,10 +8994,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());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -9016,10 +9021,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getConnector_Edge_IncomingLinks(View view) {

 		Connector modelElement = (Connector) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -9041,10 +9048,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());

+		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;

 	}

 

@@ -9053,10 +9062,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	public List<UMLLinkDescriptor> getInformationFlow_Edge_IncomingLinks(View view) {

 		InformationFlow modelElement = (InformationFlow) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		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_ComponentRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));

 		result.addAll(getIncomingTypeModelFacetLinks_Substitution_Edge(modelElement, crossReferencer));

@@ -11042,10 +11053,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ComponentRealization_Edge(Package container) {

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ComponentRealization_Edge(

+			Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof ComponentRealization) {

 				continue;

@@ -11066,7 +11077,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_Edge, ComponentRealizationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_Edge,

+					ComponentRealizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11074,10 +11086,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_Edge(Package container) {

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_Edge(

+			Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof InterfaceRealization) {

 				continue;

@@ -11098,7 +11110,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_Edge, InterfaceRealizationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_Edge,

+					InterfaceRealizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11108,8 +11121,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Substitution_Edge(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Substitution) {

 				continue;

@@ -11130,7 +11142,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_Edge, SubstitutionEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_Edge,

+					SubstitutionEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11140,8 +11153,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Realization_Edge(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Realization) {

 				continue;

@@ -11162,7 +11174,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_Edge, RealizationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_Edge,

+					RealizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11172,8 +11185,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Manifestation_Edge(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Manifestation) {

 				continue;

@@ -11194,7 +11206,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;

 	}

@@ -11204,8 +11217,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Abstraction_Edge(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Abstraction) {

 				continue;

@@ -11226,7 +11238,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_Edge, AbstractionEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_Edge,

+					AbstractionEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11236,8 +11249,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Usage_Edge(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Usage) {

 				continue;

@@ -11268,8 +11280,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Deployment_Edge(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Deployment) {

 				continue;

@@ -11290,7 +11301,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;

 	}

@@ -11298,10 +11310,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_RoleBindingEdge(Package container) {

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_RoleBindingEdge(

+			Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Dependency) {

 				continue;

@@ -11322,7 +11334,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_RoleBindingEdge, RoleBindingEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_RoleBindingEdge,

+					RoleBindingEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11332,8 +11345,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_Edge(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Dependency) {

 				continue;

@@ -11354,7 +11366,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;

 	}

@@ -11362,10 +11375,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Connector_Edge(StructuredClassifier container) {

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Connector_Edge(

+			StructuredClassifier container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getOwnedConnectors()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getOwnedConnectors().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Connector) {

 				continue;

@@ -11386,7 +11399,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			ConnectorEnd src = (ConnectorEnd) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Connector_Edge, ConnectorEditPart.VISUAL_ID));

+			result.add(

+					new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Connector_Edge, ConnectorEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11396,8 +11410,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_Edge(Classifier container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getGeneralizations()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Generalization) {

 				continue;

@@ -11408,7 +11421,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;

 	}

@@ -11418,8 +11432,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InformationFlow_Edge(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof InformationFlow) {

 				continue;

@@ -11440,7 +11453,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_Edge, InformationFlowEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_Edge,

+					InformationFlowEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11448,12 +11462,14 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(Element target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(

+			Element target, CrossReferenceAdapter crossReferencer) {

 		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;

@@ -11462,12 +11478,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(Element target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(

+			Element target, CrossReferenceAdapter crossReferencer) {

 		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;

@@ -11476,11 +11495,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ComponentRealization_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ComponentRealization_Edge(

+			NamedElement target, CrossReferenceAdapter crossReferencer) {

 		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 ComponentRealization) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier()

+					|| false == setting.getEObject() instanceof ComponentRealization) {

 				continue;

 			}

 			ComponentRealization link = (ComponentRealization) setting.getEObject();

@@ -11493,7 +11514,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.ComponentRealization_Edge, ComponentRealizationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.ComponentRealization_Edge,

+					ComponentRealizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11501,11 +11523,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(

+			NamedElement target, CrossReferenceAdapter crossReferencer) {

 		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 InterfaceRealization) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier()

+					|| false == setting.getEObject() instanceof InterfaceRealization) {

 				continue;

 			}

 			InterfaceRealization link = (InterfaceRealization) setting.getEObject();

@@ -11518,7 +11542,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InterfaceRealization_Edge, InterfaceRealizationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InterfaceRealization_Edge,

+					InterfaceRealizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11526,11 +11551,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Substitution_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Substitution_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

 		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 Substitution) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier()

+					|| false == setting.getEObject() instanceof Substitution) {

 				continue;

 			}

 			Substitution link = (Substitution) setting.getEObject();

@@ -11543,7 +11570,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Substitution_Edge, SubstitutionEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Substitution_Edge,

+					SubstitutionEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11551,11 +11579,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Realization_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Realization_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

 		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 Realization) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier()

+					|| false == setting.getEObject() instanceof Realization) {

 				continue;

 			}

 			Realization link = (Realization) setting.getEObject();

@@ -11568,7 +11598,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Realization_Edge, RealizationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Realization_Edge,

+					RealizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11576,11 +11607,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Manifestation_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Manifestation_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

 		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();

@@ -11593,7 +11626,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;

 	}

@@ -11601,11 +11635,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Abstraction_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Abstraction_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

 		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 Abstraction) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier()

+					|| false == setting.getEObject() instanceof Abstraction) {

 				continue;

 			}

 			Abstraction link = (Abstraction) setting.getEObject();

@@ -11618,7 +11654,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Abstraction_Edge, AbstractionEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Abstraction_Edge,

+					AbstractionEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11626,11 +11663,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

 		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 Usage) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier()

+					|| false == setting.getEObject() instanceof Usage) {

 				continue;

 			}

 			Usage link = (Usage) setting.getEObject();

@@ -11651,11 +11690,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Deployment_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Deployment_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

 		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();

@@ -11668,7 +11709,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;

 	}

@@ -11676,11 +11718,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_RoleBindingEdge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_RoleBindingEdge(

+			NamedElement target, CrossReferenceAdapter crossReferencer) {

 		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();

@@ -11693,7 +11737,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_RoleBindingEdge, RoleBindingEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_RoleBindingEdge,

+					RoleBindingEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11701,11 +11746,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

 		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();

@@ -11718,7 +11765,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;

 	}

@@ -11726,11 +11774,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_Edge(Classifier target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_Edge(Classifier target,

+			CrossReferenceAdapter crossReferencer) {

 		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();

@@ -11738,7 +11788,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;

 	}

@@ -11746,12 +11797,14 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(

+			NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

 		for (EStructuralFeature.Setting setting : settings) {

 			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getTimeObservation_Event()) {

-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.TimeObservation_EventEdge, TimeObservationEventEditPart.VISUAL_ID));

+				result.add(new UMLLinkDescriptor(setting.getEObject(), target,

+						UMLElementTypes.TimeObservation_EventEdge, TimeObservationEventEditPart.VISUAL_ID));

 			}

 		}

 		return result;

@@ -11760,12 +11813,14 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(

+			NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

 		for (EStructuralFeature.Setting setting : settings) {

 			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getDurationObservation_Event()) {

-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.DurationObservation_EventEdge, DurationObservationEventEditPart.VISUAL_ID));

+				result.add(new UMLLinkDescriptor(setting.getEObject(), target,

+						UMLElementTypes.DurationObservation_EventEdge, DurationObservationEventEditPart.VISUAL_ID));

 			}

 		}

 		return result;

@@ -11774,12 +11829,14 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Representation_Edge(Classifier target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Representation_Edge(Classifier target,

+			CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

 		for (EStructuralFeature.Setting setting : settings) {

 			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getInformationItem_Represented()) {

-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Representation_Edge, RepresentationEditPart.VISUAL_ID));

+				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Representation_Edge,

+						RepresentationEditPart.VISUAL_ID));

 			}

 		}

 		return result;

@@ -11788,11 +11845,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InformationFlow_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) {

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InformationFlow_Edge(NamedElement target,

+			CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

 		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInformationFlow_InformationTarget() || false == setting.getEObject() instanceof InformationFlow) {

+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInformationFlow_InformationTarget()

+					|| false == setting.getEObject() instanceof InformationFlow) {

 				continue;

 			}

 			InformationFlow link = (InformationFlow) setting.getEObject();

@@ -11805,7 +11864,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 			NamedElement src = (NamedElement) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InformationFlow_Edge, InformationFlowEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InformationFlow_Edge,

+					InformationFlowEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11813,12 +11873,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(Comment source) {

+	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(

+			Comment source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getAnnotatedElements()

-				.iterator(); destinations.hasNext();) {

+		for (Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {

 			Element destination = (Element) destinations.next();

-			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Comment_AnnotatedElementEdge,

+					CommentAnnotatedElementEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11826,12 +11887,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(Constraint source) {

+	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(

+			Constraint source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getConstrainedElements()

-				.iterator(); destinations.hasNext();) {

+		for (Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {

 			Element destination = (Element) destinations.next();

-			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Constraint_ConstrainedElementEdge,

+					ConstraintConstrainedElementEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11839,7 +11901,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(NamedElement source) {

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_ComponentRealization_Edge(

+			NamedElement source) {

 		Package container = null;

 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

@@ -11853,8 +11916,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof ComponentRealization) {

 				continue;

@@ -11878,7 +11940,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_Edge, ComponentRealizationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_Edge,

+					ComponentRealizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11886,7 +11949,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(NamedElement source) {

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_InterfaceRealization_Edge(

+			NamedElement source) {

 		Package container = null;

 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

@@ -11900,8 +11964,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof InterfaceRealization) {

 				continue;

@@ -11925,7 +11988,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_Edge, InterfaceRealizationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_Edge,

+					InterfaceRealizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11947,8 +12011,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Substitution) {

 				continue;

@@ -11972,7 +12035,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_Edge, SubstitutionEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_Edge,

+					SubstitutionEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -11994,8 +12058,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Realization) {

 				continue;

@@ -12019,7 +12082,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_Edge, RealizationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_Edge,

+					RealizationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -12041,8 +12105,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Manifestation) {

 				continue;

@@ -12066,7 +12129,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;

 	}

@@ -12088,8 +12152,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Abstraction) {

 				continue;

@@ -12113,7 +12176,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_Edge, AbstractionEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_Edge,

+					AbstractionEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -12135,8 +12199,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Usage) {

 				continue;

@@ -12182,8 +12245,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Deployment) {

 				continue;

@@ -12207,7 +12269,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;

 	}

@@ -12215,7 +12278,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_RoleBindingEdge(NamedElement source) {

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_RoleBindingEdge(

+			NamedElement source) {

 		Package container = null;

 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

@@ -12229,8 +12293,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Dependency) {

 				continue;

@@ -12254,7 +12317,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_RoleBindingEdge, RoleBindingEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_RoleBindingEdge,

+					RoleBindingEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -12276,8 +12340,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Dependency) {

 				continue;

@@ -12301,7 +12364,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;

 	}

@@ -12323,8 +12387,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getGeneralizations()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Generalization) {

 				continue;

@@ -12338,7 +12401,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;

 	}

@@ -12346,25 +12410,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_TimeObservation_EventEdge(TimeObservation source) {

+	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_TimeObservation_EventEdge(

+			TimeObservation source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		NamedElement destination = source.getEvent();

 		if (destination == null) {

 			return result;

 		}

-		result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.TimeObservation_EventEdge, TimeObservationEventEditPart.VISUAL_ID));

+		result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.TimeObservation_EventEdge,

+				TimeObservationEventEditPart.VISUAL_ID));

 		return result;

 	}

 

 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_DurationObservation_EventEdge(DurationObservation source) {

+	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_DurationObservation_EventEdge(

+			DurationObservation source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getEvents()

-				.iterator(); destinations.hasNext();) {

+		for (Iterator<?> destinations = source.getEvents().iterator(); destinations.hasNext();) {

 			NamedElement destination = (NamedElement) destinations.next();

-			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.DurationObservation_EventEdge, DurationObservationEventEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.DurationObservation_EventEdge,

+					DurationObservationEventEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -12372,12 +12439,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Representation_Edge(InformationItem source) {

+	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Representation_Edge(

+			InformationItem source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getRepresenteds()

-				.iterator(); destinations.hasNext();) {

+		for (Iterator<?> destinations = source.getRepresenteds().iterator(); destinations.hasNext();) {

 			Classifier destination = (Classifier) destinations.next();

-			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Representation_Edge, RepresentationEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Representation_Edge,

+					RepresentationEditPart.VISUAL_ID));

 		}

 		return result;

 	}

@@ -12399,8 +12467,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof InformationFlow) {

 				continue;

@@ -12424,10 +12491,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			if (src != source) {

 				continue;

 			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_Edge, InformationFlowEditPart.VISUAL_ID));

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_Edge,

+					InformationFlowEditPart.VISUAL_ID));

 		}

 		return result;

 	}

 

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java
index c68000b0e99..726e7908c1a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java
@@ -76,9 +76,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;

@@ -96,9 +96,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();

@@ -156,7 +156,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	private TransactionalEditingDomain createEditingDomain() {

 		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();

 		editingDomain.setID("org.eclipse.papyrus.uml.diagram.composite.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() {

 

@@ -214,7 +216,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) {

@@ -251,9 +253,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));

 		}

 	}

@@ -316,7 +318,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);

@@ -479,7 +482,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;

 	}

@@ -524,30 +528,31 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException {

+	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite)

+			throws CoreException {

 		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);

@@ -572,23 +577,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();

 					}

@@ -596,10 +606,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();

 		}

@@ -614,7 +626,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

 			}

 		}

@@ -640,7 +653,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;

 		}

@@ -964,7 +978,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.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java
index d58dee824fa..0ee37ce89f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java
@@ -84,19 +84,16 @@ 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,

-				CompositeStructureDiagramEditPart.MODEL_ID));

+		wizard.setWindowTitle(

+				NLS.bind(Messages.InitDiagramFile_WizardTitle, CompositeStructureDiagramEditPart.MODEL_ID));

 		UMLDiagramEditorUtil.runWizard(getShell(), wizard, "InitDiagramFile"); //$NON-NLS-1$

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLLinkDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLLinkDescriptor.java
index 818723270b5..b8a1dac2202 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLLinkDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLLinkDescriptor.java
@@ -29,7 +29,8 @@ public class UMLLinkDescriptor extends UpdaterLinkDescriptor {
 	/**

 	 * @generated

 	 */

-	public UMLLinkDescriptor(EObject source, EObject destination, EObject linkElement, IElementType elementType, String linkVID) {

+	public UMLLinkDescriptor(EObject source, EObject destination, EObject linkElement, IElementType elementType,

+			String linkVID) {

 		super(source, destination, linkElement, elementType, linkVID);

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java
index d5db3d5a320..9cf55e83eb8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java
@@ -63,17 +63,15 @@ public class UMLNewDiagramFileWizard extends Wizard {
 	/**

 	 * @generated

 	 */

-	public UMLNewDiagramFileWizard(URI domainModelURI,

-			EObject diagramRoot,

-			TransactionalEditingDomain editingDomain) {

+	public UMLNewDiagramFileWizard(URI domainModelURI, EObject diagramRoot, TransactionalEditingDomain editingDomain) {

 		assert domainModelURI != null : "Domain model uri must be specified"; //$NON-NLS-1$

 		assert diagramRoot != null : "Doagram root element must be specified"; //$NON-NLS-1$

 		assert editingDomain != null : "Editing domain must be specified"; //$NON-NLS-1$

 

-		myFileCreationPage = new WizardNewFileCreationPage(Messages.UMLNewDiagramFileWizard_CreationPageName, StructuredSelection.EMPTY);

+		myFileCreationPage = new WizardNewFileCreationPage(Messages.UMLNewDiagramFileWizard_CreationPageName,

+				StructuredSelection.EMPTY);

 		myFileCreationPage.setTitle(Messages.UMLNewDiagramFileWizard_CreationPageTitle);

-		myFileCreationPage.setDescription(NLS.bind(

-				Messages.UMLNewDiagramFileWizard_CreationPageDescription,

+		myFileCreationPage.setDescription(NLS.bind(Messages.UMLNewDiagramFileWizard_CreationPageDescription,

 				CompositeStructureDiagramEditPart.MODEL_ID));

 		IPath filePath;

 		String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment());

@@ -86,10 +84,10 @@ public class UMLNewDiagramFileWizard extends Wizard {
 			throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$

 		}

 		myFileCreationPage.setContainerFullPath(filePath);

-		myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(

-				filePath, fileName, "uml_csd")); //$NON-NLS-1$

+		myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "uml_csd")); //$NON-NLS-1$

 

-		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName);

+		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(

+				Messages.UMLNewDiagramFileWizard_RootSelectionPageName);

 		diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);

 		diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription);

 		diagramRootElementSelectionPage.setModelElement(diagramRoot);

@@ -116,40 +114,34 @@ public class UMLNewDiagramFileWizard extends Wizard {
 		URI diagramModelURI = URI.createPlatformResourceURI(diagramFile.getFullPath().toString(), true);

 		ResourceSet resourceSet = myEditingDomain.getResourceSet();

 		final Resource diagramResource = resourceSet.createResource(diagramModelURI);

-		AbstractTransactionalCommand command = new AbstractTransactionalCommand(

-				myEditingDomain, Messages.UMLNewDiagramFileWizard_InitDiagramCommand, affectedFiles) {

+		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(CompositeStructureDiagramEditPart.VISUAL_ID)) {

-					return CommandResult.newErrorCommandResult(

-							Messages.UMLNewDiagramFileWizard_IncorrectRootError);

+					return CommandResult.newErrorCommandResult(Messages.UMLNewDiagramFileWizard_IncorrectRootError);

 				}

-				Diagram diagram = ViewService.createDiagram(

-						diagramRootElementSelectionPage.getModelElement(), CompositeStructureDiagramEditPart.MODEL_ID,

-						UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				Diagram diagram = ViewService.createDiagram(diagramRootElementSelectionPage.getModelElement(),

+						CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

 				diagramResource.getContents().add(diagram);

 				new UMLDiagramContentInitializer().initDiagramContent(diagram);

 				return CommandResult.newOKCommandResult();

 			}

 		};

 		try {

-			OperationHistoryFactory.getOperationHistory().execute(

-					command, new NullProgressMonitor(), null);

+			OperationHistoryFactory.getOperationHistory().execute(command, new NullProgressMonitor(), null);

 			diagramResource.save(UMLDiagramEditorUtil.getSaveOptions());

 			UMLDiagramEditorUtil.openDiagram(diagramResource);

 		} catch (ExecutionException e) {

-			UMLDiagramEditorPlugin.getInstance().logError(

-					"Unable to create model and diagram", e); //$NON-NLS-1$

+			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;

 	}

@@ -181,10 +173,10 @@ public class UMLNewDiagramFileWizard extends Wizard {
 				setErrorMessage(Messages.UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage);

 				return false;

 			}

-			boolean result = ViewService.getInstance().provides(

-					new CreateDiagramViewOperation(

-							new EObjectAdapter(getModelElement()),

-							CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));

+			boolean result = ViewService.getInstance()

+					.provides(new CreateDiagramViewOperation(new EObjectAdapter(getModelElement()),

+							CompositeStructureDiagramEditPart.MODEL_ID,

+							UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));

 			setErrorMessage(result ? null : Messages.UMLNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage);

 			return result;

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java
index 8f7b0ab0158..805a4c17570 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java
@@ -278,7 +278,6 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 		return null;

 	}

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
index 476aa399561..5f0b59f9597 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
@@ -98,13 +98,15 @@ public class UMLVisualIDRegistry {
 		if (domainElement == null) {

 			return "";

 		}

-		String containerModelID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(containerView);

+		String containerModelID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry

+				.getModelID(containerView);

 		if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

 			return "";

 		}

 		String containerVisualID;

 		if (CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(containerView);

+			containerVisualID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry

+					.getVisualID(containerView);

 		} else {

 			if (containerView instanceof Diagram) {

 				containerVisualID = CompositeStructureDiagramEditPart.VISUAL_ID;

@@ -458,7 +460,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 					return ParameterEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -553,7 +556,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 					return ParameterEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -648,7 +652,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 					return ParameterEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -743,7 +748,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 					return ParameterEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -838,7 +844,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 					return ParameterEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -933,7 +940,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 					return ParameterEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -1025,7 +1033,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -1117,7 +1126,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -1209,7 +1219,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -1301,7 +1312,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case NodeCompositeCompartmentEditPartCN.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -1393,7 +1405,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case ClassCompositeCompartmentEditPartCN.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -1488,7 +1501,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -1520,7 +1534,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 					return ParameterEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -1615,7 +1630,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 					return ParameterEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -1710,7 +1726,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 					return ParameterEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -1805,7 +1822,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 					return ParameterEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -1900,7 +1918,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 					return ParameterEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -1995,7 +2014,8 @@ public class UMLVisualIDRegistry {
 				if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 					return ParameterEditPart.VISUAL_ID;

 				}

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -2087,7 +2107,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case ComponentCompositeCompartmentEditPart.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -2179,7 +2200,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case DeviceCompositeCompartmentEditPart.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -2271,7 +2293,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -2363,7 +2386,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case NodeCompositeCompartmentEditPart.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -2455,7 +2479,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case ClassCompositeCompartmentEditPart.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -2547,7 +2572,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case CollaborationCompositeCompartmentEditPart.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

@@ -2576,7 +2602,8 @@ public class UMLVisualIDRegistry {
 				}

 				break;

 			case PropertyPartCompartmentEditPartCN.VISUAL_ID:

-				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_Shape(containerView, (Property) domainElement)) {

+				if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())

+						&& isProperty_Shape(containerView, (Property) domainElement)) {

 					return PropertyPartEditPartCN.VISUAL_ID;

 				}

 				if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

@@ -2592,13 +2619,15 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static boolean canCreateNode(View containerView, String nodeVisualID) {

-		String containerModelID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(containerView);

+		String containerModelID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry

+				.getModelID(containerView);

 		if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

 			return false;

 		}

 		String containerVisualID;

 		if (CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(containerView);

+			containerVisualID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry

+					.getVisualID(containerView);

 		} else {

 			if (containerView instanceof Diagram) {

 				containerVisualID = CompositeStructureDiagramEditPart.VISUAL_ID;

@@ -5926,10 +5955,12 @@ public class UMLVisualIDRegistry {
 		if (UMLPackage.eINSTANCE.getDeployment().isSuperTypeOf(domainElement.eClass())) {

 			return DeploymentEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass()) && isDependency_RoleBindingEdge((Dependency) domainElement)) {

+		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())

+				&& isDependency_RoleBindingEdge((Dependency) domainElement)) {

 			return RoleBindingEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass()) && isDependency_Edge((Dependency) domainElement)) {

+		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())

+				&& isDependency_Edge((Dependency) domainElement)) {

 			return DependencyEditPart.VISUAL_ID;

 		}

 		if (UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(domainElement.eClass())) {

@@ -5958,7 +5989,7 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	private static boolean isProperty_Shape(View containerView, Property domainElement) {

-		// Property / CollaborationRole constraint

+		// Property / CollaborationRole constraint		

 		// Restriction for the case where domainElement owner is a Collaboration

 		// If the domainElement is not referenced as one of its owner role

 		// then it should be considered as a Property creation on Collaboration,

@@ -6008,7 +6039,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);

@@ -6154,7 +6185,8 @@ public class UMLVisualIDRegistry {
 		 */

 		@Override

 		public String getNodeVisualID(View containerView, EObject domainElement) {

-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);

+			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getNodeVisualID(containerView,

+					domainElement);

 		}

 

 		/**

@@ -6162,7 +6194,8 @@ public class UMLVisualIDRegistry {
 		 */

 		@Override

 		public boolean checkNodeVisualID(View containerView, EObject domainElement, String candidate) {

-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate);

+			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.checkNodeVisualID(containerView,

+					domainElement, candidate);

 		}

 

 		/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java
index 2265ebd3c3b..34ac4a9a6d1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java
@@ -75,16 +75,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$

 			}

@@ -97,8 +94,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 {

@@ -106,8 +103,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$

 		}

 	}

 

@@ -120,8 +116,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);

 	}

 

@@ -144,8 +140,7 @@ public class ValidateAction extends Action {
 	/**

 	 * @generated

 	 */

-	private static Diagnostic runEMFValidator(

-			View target) {

+	private static Diagnostic runEMFValidator(View target) {

 		if (target.isSetElement() && target.getElement() != null) {

 			return new Diagnostician() {

 

@@ -161,16 +156,15 @@ public class ValidateAction extends Action {
 	/**

 	 * @generated

 	 */

-	private static void validate(DiagramEditPart diagramEditPart,

-			View view) {

+	private static void validate(DiagramEditPart diagramEditPart, View view) {

 		IFile target = view.eResource() != null ? WorkspaceSynchronizer.getFile(view.eResource()) : null;

 		if (target != null) {

 			UMLMarkerNavigationProvider.deleteMarkers(target);

 		}

 		Diagnostic diagnostic = runEMFValidator(view);

 		createMarkers(target, diagnostic, diagramEditPart);

-		IBatchValidator validator = (IBatchValidator) ModelValidationService.getInstance().newValidator(

-				EvaluationMode.BATCH);

+		IBatchValidator validator = (IBatchValidator) ModelValidationService.getInstance()

+				.newValidator(EvaluationMode.BATCH);

 		validator.setIncludeLiveConstraints(true);

 		if (view.isSetElement() && view.getElement() != null) {

 			IStatus status = validator.validate(view.getElement());

@@ -181,10 +175,7 @@ public class ValidateAction extends Action {
 	/**

 	 * @generated

 	 */

-	private static void createMarkers(

-			IFile target,

-			IStatus validationStatus,

-			DiagramEditPart diagramEditPart) {

+	private static void createMarkers(IFile target, IStatus validationStatus, DiagramEditPart diagramEditPart) {

 		if (validationStatus.isOK()) {

 			return;

 		}

@@ -195,21 +186,17 @@ 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());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	private static void createMarkers(

-			IFile target,

-			Diagnostic emfValidationStatus,

-			DiagramEditPart diagramEditPart) {

+	private static void createMarkers(IFile target, Diagnostic emfValidationStatus, DiagramEditPart diagramEditPart) {

 		if (emfValidationStatus.getSeverity() == Diagnostic.OK) {

 			return;

 		}

@@ -223,11 +210,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()));

 			}

 		}

 	}

@@ -235,14 +221,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);

 	}

 

 	/**

@@ -255,8 +239,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;

@@ -265,8 +248,8 @@ public class ValidateAction extends Action {
 	/**

 	 * @generated

 	 */

-	private static Set<EObject> collectTargetElements(IStatus status,

-			Set<EObject> targetElementCollector, List<IConstraintStatus> allConstraintStatuses) {

+	private static Set<EObject> collectTargetElements(IStatus status, Set<EObject> targetElementCollector,

+			List<IConstraintStatus> allConstraintStatuses) {

 		if (status instanceof IConstraintStatus) {

 			targetElementCollector.add(((IConstraintStatus) status).getTarget());

 			allConstraintStatuses.add((IConstraintStatus) status);

@@ -283,8 +266,8 @@ public class ValidateAction extends Action {
 	/**

 	 * @generated

 	 */

-	private static Set<EObject> collectTargetElements(Diagnostic diagnostic,

-			Set<EObject> targetElementCollector, List<Diagnostic> allDiagnostics) {

+	private static Set<EObject> collectTargetElements(Diagnostic diagnostic, Set<EObject> targetElementCollector,

+			List<Diagnostic> allDiagnostics) {

 		List<?> data = diagnostic.getData();

 		EObject target = null;

 		if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java
index 518ca2c2190..8f80b18fe10 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java
@@ -100,8 +100,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Activity_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$

@@ -115,8 +114,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Interaction_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$

@@ -130,8 +128,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_ProtocolStateMachine_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$

@@ -145,8 +142,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_StateMachine_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$

@@ -160,8 +156,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_FunctionBehavior_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$

@@ -175,8 +170,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_OpaqueBehavior_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$

@@ -190,8 +184,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Component_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$

@@ -205,8 +198,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$

@@ -220,8 +212,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$

@@ -235,8 +226,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$

@@ -250,8 +240,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Class_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$

@@ -265,8 +254,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Collaboration_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$

@@ -280,8 +268,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Interface_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$

@@ -295,8 +282,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_PrimitiveType_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$

@@ -310,8 +296,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Enumeration_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$

@@ -325,8 +310,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_DataType_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$

@@ -340,8 +324,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Actor_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$

@@ -355,8 +338,7 @@ 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);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -370,8 +352,7 @@ 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);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -385,13 +366,11 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_InformationItem_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 			Object value_1 = isAbstract_InformationItem_Shape(instance);

 			if (value_1 != null) {

-				instance.setIsAbstract(

-						((Boolean) value_1).booleanValue());

+				instance.setIsAbstract(((Boolean) value_1).booleanValue());

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -405,8 +384,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Signal_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$

@@ -420,8 +398,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_UseCase_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$

@@ -435,8 +412,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_SignalEvent_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$

@@ -450,8 +426,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_CallEvent_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$

@@ -465,8 +440,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_AnyReceiveEvent_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$

@@ -480,8 +454,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_ChangeEvent_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$

@@ -495,8 +468,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_TimeEvent_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$

@@ -510,8 +482,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_DurationObservation_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$

@@ -525,8 +496,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_TimeObservation_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$

@@ -540,8 +510,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_LiteralBoolean_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$

@@ -555,8 +524,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_LiteralInteger_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$

@@ -570,8 +538,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_LiteralNull_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$

@@ -585,8 +552,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_LiteralString_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$

@@ -600,8 +566,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_LiteralUnlimitedNatural_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$

@@ -615,8 +580,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_StringExpression_PackagedElementShape(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$

@@ -630,8 +594,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_OpaqueExpression_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$

@@ -645,8 +608,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_TimeExpression_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$

@@ -660,8 +622,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Expression_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$

@@ -675,8 +636,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Duration_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$

@@ -690,8 +650,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_TimeInterval_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$

@@ -705,8 +664,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_DurationInterval_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$

@@ -720,8 +678,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Interval_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$

@@ -735,8 +692,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_InstanceValue_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$

@@ -750,8 +706,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$

@@ -765,13 +720,11 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_DurationConstraint_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 			Object value_1 = specification_DurationConstraint_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$

@@ -785,13 +738,11 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_TimeConstraint_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 			Object value_1 = specification_TimeConstraint_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$

@@ -805,13 +756,11 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_IntervalConstraint_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 			Object value_1 = specification_IntervalConstraint_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$

@@ -825,13 +774,11 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_InteractionConstraint_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 			Object value_1 = specification_InteractionConstraint_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$

@@ -845,13 +792,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$

@@ -865,11 +810,9 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Port_BehaviorShape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

-			instance.setAggregation(

-					AggregationKind.COMPOSITE_LITERAL);

+			instance.setAggregation(AggregationKind.COMPOSITE_LITERAL);

 

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -883,11 +826,9 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Port_Shape(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

-			instance.setAggregation(

-					AggregationKind.COMPOSITE_LITERAL);

+			instance.setAggregation(AggregationKind.COMPOSITE_LITERAL);

 

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -901,8 +842,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Parameter_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$

@@ -916,8 +856,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Property_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$

@@ -931,8 +870,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_ConnectableElement_CollaborationRoleShape(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$

@@ -946,8 +884,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_CollaborationUse_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$

@@ -961,8 +898,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Activity_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$

@@ -976,8 +912,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Interaction_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$

@@ -991,8 +926,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_ProtocolStateMachine_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$

@@ -1006,8 +940,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_StateMachine_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$

@@ -1021,8 +954,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_FunctionBehavior_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$

@@ -1036,8 +968,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_OpaqueBehavior_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$

@@ -1051,8 +982,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Component_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$

@@ -1066,8 +996,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$

@@ -1081,8 +1010,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$

@@ -1096,8 +1024,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$

@@ -1111,8 +1038,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Class_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$

@@ -1126,8 +1052,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Collaboration_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$

@@ -1141,8 +1066,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Interface_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$

@@ -1156,8 +1080,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_PrimitiveType_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$

@@ -1171,8 +1094,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Enumeration_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$

@@ -1186,8 +1108,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_DataType_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$

@@ -1201,8 +1122,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Actor_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$

@@ -1216,8 +1136,7 @@ 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);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -1231,8 +1150,7 @@ 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);

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -1246,13 +1164,11 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_InformationItem_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 			Object value_1 = isAbstract_InformationItem_Shape_CN(instance);

 			if (value_1 != null) {

-				instance.setIsAbstract(

-						((Boolean) value_1).booleanValue());

+				instance.setIsAbstract(((Boolean) value_1).booleanValue());

 			}

 		} catch (RuntimeException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

@@ -1266,8 +1182,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Signal_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$

@@ -1281,8 +1196,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_UseCase_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$

@@ -1296,8 +1210,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$

@@ -1311,13 +1224,11 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_DurationConstraint_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 			Object value_1 = specification_DurationConstraint_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$

@@ -1331,13 +1242,11 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_TimeConstraint_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 			Object value_1 = specification_TimeConstraint_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$

@@ -1351,13 +1260,11 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_IntervalConstraint_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 			Object value_1 = specification_IntervalConstraint_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$

@@ -1371,13 +1278,11 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_InteractionConstraint_Shape_CN(instance);

 			if (value_0 != null) {

-				instance.setName(

-						(String) value_0);

+				instance.setName((String) value_0);

 			}

 			Object value_1 = specification_InteractionConstraint_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$

@@ -1391,13 +1296,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$

@@ -1411,8 +1314,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Property_AttributeLabel(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$

@@ -1426,8 +1328,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Operation_OperationLabel(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$

@@ -1441,8 +1342,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_EnumerationLiteral_LiteralLabel(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$

@@ -1456,8 +1356,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_ComponentRealization_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$

@@ -1471,8 +1370,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_InterfaceRealization_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$

@@ -1486,8 +1384,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Substitution_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$

@@ -1501,8 +1398,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Realization_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$

@@ -1516,8 +1412,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$

@@ -1531,8 +1426,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Abstraction_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$

@@ -1546,8 +1440,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Usage_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$

@@ -1561,8 +1454,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$

@@ -1576,8 +1468,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$

@@ -1591,8 +1482,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_Connector_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$

@@ -1606,8 +1496,7 @@ public class ElementInitializers {
 		try {

 			Object value_0 = name_InformationFlow_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.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java
index 6f14c83520d..b69294dbd76 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java
@@ -25,9 +25,7 @@ public class UMLEditPartProvider extends DefaultEditPartProvider {
 	 * @generated

 	 */

 	public UMLEditPartProvider() {

-		super(new UMLEditPartFactory(),

-				UMLVisualIDRegistry.TYPED_INSTANCE,

-				CompositeStructureDiagramEditPart.MODEL_ID);

+		super(new UMLEditPartFactory(), UMLVisualIDRegistry.TYPED_INSTANCE, CompositeStructureDiagramEditPart.MODEL_ID);

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java
index e752f2bdb3b..a6b241bcfa8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java
@@ -47,7 +47,8 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());

+	private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages(

+			UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());

 

 	/**

 	 * @generated

@@ -57,35 +58,43 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_CompositeStructureDiagram = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Package_CompositeStructureDiagram"); //$NON-NLS-1$

+	public static final IElementType Package_CompositeStructureDiagram = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Package_CompositeStructureDiagram"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Activity_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Activity_Shape"); //$NON-NLS-1$

+	public static final IElementType Activity_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Activity_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Interaction_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Interaction_Shape"); //$NON-NLS-1$

+	public static final IElementType Interaction_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Interaction_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType ProtocolStateMachine_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape"); //$NON-NLS-1$

+	public static final IElementType ProtocolStateMachine_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType StateMachine_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.StateMachine_Shape"); //$NON-NLS-1$

+	public static final IElementType StateMachine_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.StateMachine_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType FunctionBehavior_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.FunctionBehavior_Shape"); //$NON-NLS-1$

+	public static final IElementType FunctionBehavior_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.FunctionBehavior_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType OpaqueBehavior_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.OpaqueBehavior_Shape"); //$NON-NLS-1$

+	public static final IElementType OpaqueBehavior_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.OpaqueBehavior_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Component_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Component_Shape"); //$NON-NLS-1$

+	public static final IElementType Component_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Component_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

@@ -93,7 +102,8 @@ public class UMLElementTypes {
 	/**

 	 * @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

 	 */

@@ -105,23 +115,28 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	public static final IElementType Collaboration_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Collaboration_Shape"); //$NON-NLS-1$

+	public static final IElementType Collaboration_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Collaboration_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Interface_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Interface_Shape"); //$NON-NLS-1$

+	public static final IElementType Interface_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Interface_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType PrimitiveType_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.PrimitiveType_Shape"); //$NON-NLS-1$

+	public static final IElementType PrimitiveType_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.PrimitiveType_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Enumeration_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Enumeration_Shape"); //$NON-NLS-1$

+	public static final IElementType Enumeration_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Enumeration_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType DataType_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DataType_Shape"); //$NON-NLS-1$

+	public static final IElementType DataType_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.DataType_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

@@ -129,15 +144,18 @@ public class UMLElementTypes {
 	/**

 	 * @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 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 InformationItem_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InformationItem_Shape"); //$NON-NLS-1$

+	public static final IElementType InformationItem_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.InformationItem_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

@@ -145,119 +163,148 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	public static final IElementType UseCase_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.UseCase_Shape"); //$NON-NLS-1$

+	public static final IElementType UseCase_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.UseCase_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType SignalEvent_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.SignalEvent_Shape"); //$NON-NLS-1$

+	public static final IElementType SignalEvent_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.SignalEvent_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType CallEvent_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.CallEvent_Shape"); //$NON-NLS-1$

+	public static final IElementType CallEvent_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.CallEvent_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType AnyReceiveEvent_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.AnyReceiveEvent_Shape"); //$NON-NLS-1$

+	public static final IElementType AnyReceiveEvent_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.AnyReceiveEvent_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType ChangeEvent_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.ChangeEvent_Shape"); //$NON-NLS-1$

+	public static final IElementType ChangeEvent_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.ChangeEvent_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType TimeEvent_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.TimeEvent_Shape"); //$NON-NLS-1$

+	public static final IElementType TimeEvent_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.TimeEvent_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType DurationObservation_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DurationObservation_Shape"); //$NON-NLS-1$

+	public static final IElementType DurationObservation_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.DurationObservation_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType TimeObservation_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.TimeObservation_Shape"); //$NON-NLS-1$

+	public static final IElementType TimeObservation_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.TimeObservation_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType LiteralBoolean_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.LiteralBoolean_Shape"); //$NON-NLS-1$

+	public static final IElementType LiteralBoolean_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.LiteralBoolean_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType LiteralInteger_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.LiteralInteger_Shape"); //$NON-NLS-1$

+	public static final IElementType LiteralInteger_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.LiteralInteger_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType LiteralNull_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.LiteralNull_Shape"); //$NON-NLS-1$

+	public static final IElementType LiteralNull_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.LiteralNull_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType LiteralString_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.LiteralString_Shape"); //$NON-NLS-1$

+	public static final IElementType LiteralString_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.LiteralString_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType LiteralUnlimitedNatural_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.LiteralUnlimitedNatural_Shape"); //$NON-NLS-1$

+	public static final IElementType LiteralUnlimitedNatural_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.LiteralUnlimitedNatural_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType StringExpression_PackagedElementShape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.StringExpression_PackagedElementShape"); //$NON-NLS-1$

+	public static final IElementType StringExpression_PackagedElementShape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.StringExpression_PackagedElementShape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType OpaqueExpression_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.OpaqueExpression_Shape"); //$NON-NLS-1$

+	public static final IElementType OpaqueExpression_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.OpaqueExpression_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType TimeExpression_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.TimeExpression_Shape"); //$NON-NLS-1$

+	public static final IElementType TimeExpression_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.TimeExpression_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Expression_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Expression_Shape"); //$NON-NLS-1$

+	public static final IElementType Expression_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Expression_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Duration_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Duration_Shape"); //$NON-NLS-1$

+	public static final IElementType Duration_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Duration_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType TimeInterval_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.TimeInterval_Shape"); //$NON-NLS-1$

+	public static final IElementType TimeInterval_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.TimeInterval_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType DurationInterval_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DurationInterval_Shape"); //$NON-NLS-1$

+	public static final IElementType DurationInterval_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.DurationInterval_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Interval_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Interval_Shape"); //$NON-NLS-1$

+	public static final IElementType Interval_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Interval_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType InstanceValue_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InstanceValue_Shape"); //$NON-NLS-1$

+	public static final IElementType InstanceValue_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.InstanceValue_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 DurationConstraint_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DurationConstraint_Shape"); //$NON-NLS-1$

+	public static final IElementType DurationConstraint_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.DurationConstraint_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType TimeConstraint_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.TimeConstraint_Shape"); //$NON-NLS-1$

+	public static final IElementType TimeConstraint_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.TimeConstraint_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType IntervalConstraint_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.IntervalConstraint_Shape"); //$NON-NLS-1$

+	public static final IElementType IntervalConstraint_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.IntervalConstraint_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType InteractionConstraint_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InteractionConstraint_Shape"); //$NON-NLS-1$

+	public static final IElementType InteractionConstraint_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.InteractionConstraint_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 Port_BehaviorShape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Port_BehaviorShape"); //$NON-NLS-1$

+	public static final IElementType Port_BehaviorShape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Port_BehaviorShape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

@@ -265,183 +312,228 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	public static final IElementType Parameter_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Parameter_Shape"); //$NON-NLS-1$

+	public static final IElementType Parameter_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Parameter_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Property_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Property_Shape"); //$NON-NLS-1$

+	public static final IElementType Property_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Property_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType ConnectableElement_CollaborationRoleShape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.ConnectableElement_CollaborationRoleShape"); //$NON-NLS-1$

+	public static final IElementType ConnectableElement_CollaborationRoleShape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.ConnectableElement_CollaborationRoleShape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType CollaborationUse_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.CollaborationUse_Shape"); //$NON-NLS-1$

+	public static final IElementType CollaborationUse_Shape = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.CollaborationUse_Shape"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Activity_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Activity_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType Activity_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Activity_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Interaction_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Interaction_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType Interaction_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Interaction_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType ProtocolStateMachine_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType ProtocolStateMachine_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType StateMachine_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.StateMachine_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType StateMachine_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.StateMachine_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType FunctionBehavior_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.FunctionBehavior_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType FunctionBehavior_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.FunctionBehavior_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType OpaqueBehavior_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.OpaqueBehavior_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType OpaqueBehavior_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.OpaqueBehavior_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Component_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Component_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType Component_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Component_Shape_CN"); //$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_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_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 Class_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Class_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType Class_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Class_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Collaboration_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Collaboration_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType Collaboration_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Collaboration_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Interface_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Interface_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType Interface_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Interface_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType PrimitiveType_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType PrimitiveType_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Enumeration_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Enumeration_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType Enumeration_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Enumeration_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType DataType_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DataType_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType DataType_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.DataType_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Actor_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Actor_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType Actor_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Actor_Shape_CN"); //$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 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 InformationItem_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InformationItem_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType InformationItem_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.InformationItem_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Signal_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Signal_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType Signal_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Signal_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType UseCase_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.UseCase_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType UseCase_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.UseCase_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 DurationConstraint_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DurationConstraint_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType DurationConstraint_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.DurationConstraint_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType TimeConstraint_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.TimeConstraint_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType TimeConstraint_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.TimeConstraint_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType IntervalConstraint_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.IntervalConstraint_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType IntervalConstraint_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.IntervalConstraint_Shape_CN"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType InteractionConstraint_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InteractionConstraint_Shape_CN"); //$NON-NLS-1$

+	public static final IElementType InteractionConstraint_Shape_CN = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.InteractionConstraint_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 Property_AttributeLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Property_AttributeLabel"); //$NON-NLS-1$

+	public static final IElementType Property_AttributeLabel = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Property_AttributeLabel"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Operation_OperationLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Operation_OperationLabel"); //$NON-NLS-1$

+	public static final IElementType Operation_OperationLabel = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Operation_OperationLabel"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType EnumerationLiteral_LiteralLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel"); //$NON-NLS-1$

+	public static final IElementType EnumerationLiteral_LiteralLabel = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Port_BehaviorEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Port_BehaviorEdge"); //$NON-NLS-1$

+	public static final IElementType Port_BehaviorEdge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Port_BehaviorEdge"); //$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 ComponentRealization_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.ComponentRealization_Edge"); //$NON-NLS-1$

+	public static final IElementType ComponentRealization_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.ComponentRealization_Edge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType InterfaceRealization_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InterfaceRealization_Edge"); //$NON-NLS-1$

+	public static final IElementType InterfaceRealization_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.InterfaceRealization_Edge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Substitution_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Substitution_Edge"); //$NON-NLS-1$

+	public static final IElementType Substitution_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Substitution_Edge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Realization_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Realization_Edge"); //$NON-NLS-1$

+	public static final IElementType Realization_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Realization_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 Abstraction_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Abstraction_Edge"); //$NON-NLS-1$

+	public static final IElementType Abstraction_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Abstraction_Edge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

@@ -449,39 +541,48 @@ public class UMLElementTypes {
 	/**

 	 * @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 Dependency_RoleBindingEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Dependency_RoleBindingEdge"); //$NON-NLS-1$

+	public static final IElementType Dependency_RoleBindingEdge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Dependency_RoleBindingEdge"); //$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 Connector_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Connector_Edge"); //$NON-NLS-1$

+	public static final IElementType Connector_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Connector_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 TimeObservation_EventEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.TimeObservation_EventEdge"); //$NON-NLS-1$

+	public static final IElementType TimeObservation_EventEdge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.TimeObservation_EventEdge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType DurationObservation_EventEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DurationObservation_EventEdge"); //$NON-NLS-1$

+	public static final IElementType DurationObservation_EventEdge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.DurationObservation_EventEdge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType Representation_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Representation_Edge"); //$NON-NLS-1$

+	public static final IElementType Representation_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.Representation_Edge"); //$NON-NLS-1$

 	/**

 	 * @generated

 	 */

-	public static final IElementType InformationFlow_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InformationFlow_Edge"); //$NON-NLS-1$

+	public static final IElementType InformationFlow_Edge = getElementTypeByUniqueId(

+			"org.eclipse.papyrus.umldi.InformationFlow_Edge"); //$NON-NLS-1$

 

 	/**

 	 * @generated

@@ -523,302 +624,204 @@ public class UMLElementTypes {
 

 			elements.put(Package_CompositeStructureDiagram, UMLPackage.eINSTANCE.getPackage());

 

-

 			elements.put(Activity_Shape, UMLPackage.eINSTANCE.getActivity());

 

-

 			elements.put(Interaction_Shape, UMLPackage.eINSTANCE.getInteraction());

 

-

 			elements.put(ProtocolStateMachine_Shape, UMLPackage.eINSTANCE.getProtocolStateMachine());

 

-

 			elements.put(StateMachine_Shape, UMLPackage.eINSTANCE.getStateMachine());

 

-

 			elements.put(FunctionBehavior_Shape, UMLPackage.eINSTANCE.getFunctionBehavior());

 

-

 			elements.put(OpaqueBehavior_Shape, UMLPackage.eINSTANCE.getOpaqueBehavior());

 

-

 			elements.put(Component_Shape, UMLPackage.eINSTANCE.getComponent());

 

-

 			elements.put(Device_Shape, UMLPackage.eINSTANCE.getDevice());

 

-

 			elements.put(ExecutionEnvironment_Shape, UMLPackage.eINSTANCE.getExecutionEnvironment());

 

-

 			elements.put(Node_Shape, UMLPackage.eINSTANCE.getNode());

 

-

 			elements.put(Class_Shape, UMLPackage.eINSTANCE.getClass_());

 

-

 			elements.put(Collaboration_Shape, UMLPackage.eINSTANCE.getCollaboration());

 

-

 			elements.put(Interface_Shape, UMLPackage.eINSTANCE.getInterface());

 

-

 			elements.put(PrimitiveType_Shape, UMLPackage.eINSTANCE.getPrimitiveType());

 

-

 			elements.put(Enumeration_Shape, UMLPackage.eINSTANCE.getEnumeration());

 

-

 			elements.put(DataType_Shape, UMLPackage.eINSTANCE.getDataType());

 

-

 			elements.put(Actor_Shape, UMLPackage.eINSTANCE.getActor());

 

-

 			elements.put(DeploymentSpecification_Shape, UMLPackage.eINSTANCE.getDeploymentSpecification());

 

-

 			elements.put(Artifact_Shape, UMLPackage.eINSTANCE.getArtifact());

 

-

 			elements.put(InformationItem_Shape, UMLPackage.eINSTANCE.getInformationItem());

 

-

 			elements.put(Signal_Shape, UMLPackage.eINSTANCE.getSignal());

 

-

 			elements.put(UseCase_Shape, UMLPackage.eINSTANCE.getUseCase());

 

-

 			elements.put(SignalEvent_Shape, UMLPackage.eINSTANCE.getSignalEvent());

 

-

 			elements.put(CallEvent_Shape, UMLPackage.eINSTANCE.getCallEvent());

 

-

 			elements.put(AnyReceiveEvent_Shape, UMLPackage.eINSTANCE.getAnyReceiveEvent());

 

-

 			elements.put(ChangeEvent_Shape, UMLPackage.eINSTANCE.getChangeEvent());

 

-

 			elements.put(TimeEvent_Shape, UMLPackage.eINSTANCE.getTimeEvent());

 

-

 			elements.put(DurationObservation_Shape, UMLPackage.eINSTANCE.getDurationObservation());

 

-

 			elements.put(TimeObservation_Shape, UMLPackage.eINSTANCE.getTimeObservation());

 

-

 			elements.put(LiteralBoolean_Shape, UMLPackage.eINSTANCE.getLiteralBoolean());

 

-

 			elements.put(LiteralInteger_Shape, UMLPackage.eINSTANCE.getLiteralInteger());

 

-

 			elements.put(LiteralNull_Shape, UMLPackage.eINSTANCE.getLiteralNull());

 

-

 			elements.put(LiteralString_Shape, UMLPackage.eINSTANCE.getLiteralString());

 

-

 			elements.put(LiteralUnlimitedNatural_Shape, UMLPackage.eINSTANCE.getLiteralUnlimitedNatural());

 

-

 			elements.put(StringExpression_PackagedElementShape, UMLPackage.eINSTANCE.getStringExpression());

 

-

 			elements.put(OpaqueExpression_Shape, UMLPackage.eINSTANCE.getOpaqueExpression());

 

-

 			elements.put(TimeExpression_Shape, UMLPackage.eINSTANCE.getTimeExpression());

 

-

 			elements.put(Expression_Shape, UMLPackage.eINSTANCE.getExpression());

 

-

 			elements.put(Duration_Shape, UMLPackage.eINSTANCE.getDuration());

 

-

 			elements.put(TimeInterval_Shape, UMLPackage.eINSTANCE.getTimeInterval());

 

-

 			elements.put(DurationInterval_Shape, UMLPackage.eINSTANCE.getDurationInterval());

 

-

 			elements.put(Interval_Shape, UMLPackage.eINSTANCE.getInterval());

 

-

 			elements.put(InstanceValue_Shape, UMLPackage.eINSTANCE.getInstanceValue());

 

-

 			elements.put(Comment_Shape, UMLPackage.eINSTANCE.getComment());

 

-

 			elements.put(DurationConstraint_Shape, UMLPackage.eINSTANCE.getDurationConstraint());

 

-

 			elements.put(TimeConstraint_Shape, UMLPackage.eINSTANCE.getTimeConstraint());

 

-

 			elements.put(IntervalConstraint_Shape, UMLPackage.eINSTANCE.getIntervalConstraint());

 

-

 			elements.put(InteractionConstraint_Shape, UMLPackage.eINSTANCE.getInteractionConstraint());

 

-

 			elements.put(Constraint_Shape, UMLPackage.eINSTANCE.getConstraint());

 

-

 			elements.put(Port_BehaviorShape, UMLPackage.eINSTANCE.getPort());

 

-

 			elements.put(Port_Shape, UMLPackage.eINSTANCE.getPort());

 

-

 			elements.put(Parameter_Shape, UMLPackage.eINSTANCE.getParameter());

 

-

 			elements.put(Property_Shape, UMLPackage.eINSTANCE.getProperty());

 

-

 			elements.put(ConnectableElement_CollaborationRoleShape, UMLPackage.eINSTANCE.getConnectableElement());

 

-

 			elements.put(CollaborationUse_Shape, UMLPackage.eINSTANCE.getCollaborationUse());

 

-

 			elements.put(Activity_Shape_CN, UMLPackage.eINSTANCE.getActivity());

 

-

 			elements.put(Interaction_Shape_CN, UMLPackage.eINSTANCE.getInteraction());

 

-

 			elements.put(ProtocolStateMachine_Shape_CN, UMLPackage.eINSTANCE.getProtocolStateMachine());

 

-

 			elements.put(StateMachine_Shape_CN, UMLPackage.eINSTANCE.getStateMachine());

 

-

 			elements.put(FunctionBehavior_Shape_CN, UMLPackage.eINSTANCE.getFunctionBehavior());

 

-

 			elements.put(OpaqueBehavior_Shape_CN, UMLPackage.eINSTANCE.getOpaqueBehavior());

 

-

 			elements.put(Component_Shape_CN, UMLPackage.eINSTANCE.getComponent());

 

-

 			elements.put(Device_Shape_CN, UMLPackage.eINSTANCE.getDevice());

 

-

 			elements.put(ExecutionEnvironment_Shape_CN, UMLPackage.eINSTANCE.getExecutionEnvironment());

 

-

 			elements.put(Node_Shape_CN, UMLPackage.eINSTANCE.getNode());

 

-

 			elements.put(Class_Shape_CN, UMLPackage.eINSTANCE.getClass_());

 

-

 			elements.put(Collaboration_Shape_CN, UMLPackage.eINSTANCE.getCollaboration());

 

-

 			elements.put(Interface_Shape_CN, UMLPackage.eINSTANCE.getInterface());

 

-

 			elements.put(PrimitiveType_Shape_CN, UMLPackage.eINSTANCE.getPrimitiveType());

 

-

 			elements.put(Enumeration_Shape_CN, UMLPackage.eINSTANCE.getEnumeration());

 

-

 			elements.put(DataType_Shape_CN, UMLPackage.eINSTANCE.getDataType());

 

-

 			elements.put(Actor_Shape_CN, UMLPackage.eINSTANCE.getActor());

 

-

 			elements.put(DeploymentSpecification_Shape_CN, UMLPackage.eINSTANCE.getDeploymentSpecification());

 

-

 			elements.put(Artifact_Shape_CN, UMLPackage.eINSTANCE.getArtifact());

 

-

 			elements.put(InformationItem_Shape_CN, UMLPackage.eINSTANCE.getInformationItem());

 

-

 			elements.put(Signal_Shape_CN, UMLPackage.eINSTANCE.getSignal());

 

-

 			elements.put(UseCase_Shape_CN, UMLPackage.eINSTANCE.getUseCase());

 

-

 			elements.put(Comment_Shape_CN, UMLPackage.eINSTANCE.getComment());

 

-

 			elements.put(DurationConstraint_Shape_CN, UMLPackage.eINSTANCE.getDurationConstraint());

 

-

 			elements.put(TimeConstraint_Shape_CN, UMLPackage.eINSTANCE.getTimeConstraint());

 

-

 			elements.put(IntervalConstraint_Shape_CN, UMLPackage.eINSTANCE.getIntervalConstraint());

 

-

 			elements.put(InteractionConstraint_Shape_CN, UMLPackage.eINSTANCE.getInteractionConstraint());

 

-

 			elements.put(Constraint_Shape_CN, UMLPackage.eINSTANCE.getConstraint());

 

-

 			elements.put(Property_AttributeLabel, UMLPackage.eINSTANCE.getProperty());

 

-

 			elements.put(Operation_OperationLabel, UMLPackage.eINSTANCE.getOperation());

 

-

 			elements.put(EnumerationLiteral_LiteralLabel, UMLPackage.eINSTANCE.getEnumerationLiteral());

 

 			elements.put(Comment_AnnotatedElementEdge, UMLPackage.eINSTANCE.getComment_AnnotatedElement());

 

 			elements.put(Constraint_ConstrainedElementEdge, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());

 

-

 			elements.put(ComponentRealization_Edge, UMLPackage.eINSTANCE.getComponentRealization());

 

-

 			elements.put(InterfaceRealization_Edge, UMLPackage.eINSTANCE.getInterfaceRealization());

 

-

 			elements.put(Substitution_Edge, UMLPackage.eINSTANCE.getSubstitution());

 

-

 			elements.put(Realization_Edge, UMLPackage.eINSTANCE.getRealization());

 

-

 			elements.put(Manifestation_Edge, UMLPackage.eINSTANCE.getManifestation());

 

-

 			elements.put(Abstraction_Edge, UMLPackage.eINSTANCE.getAbstraction());

 

-

 			elements.put(Usage_Edge, UMLPackage.eINSTANCE.getUsage());

 

-

 			elements.put(Deployment_Edge, UMLPackage.eINSTANCE.getDeployment());

 

-

 			elements.put(Dependency_RoleBindingEdge, UMLPackage.eINSTANCE.getDependency());

 

-

 			elements.put(Dependency_Edge, UMLPackage.eINSTANCE.getDependency());

 

-

 			elements.put(Connector_Edge, UMLPackage.eINSTANCE.getConnector());

 

-

 			elements.put(Generalization_Edge, UMLPackage.eINSTANCE.getGeneralization());

 

 			elements.put(TimeObservation_EventEdge, UMLPackage.eINSTANCE.getTimeObservation_Event());

@@ -827,7 +830,6 @@ public class UMLElementTypes {
 

 			elements.put(Representation_Edge, UMLPackage.eINSTANCE.getInformationItem_Represented());

 

-

 			elements.put(InformationFlow_Edge, UMLPackage.eINSTANCE.getInformationFlow());

 		}

 		return elements.get(type);

@@ -1222,7 +1224,6 @@ public class UMLElementTypes {
 		}

 	};

 

-

 	/**

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java
index 2d740ccb67e..f38d121881d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java
@@ -29,8 +29,7 @@ import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil;
 /**

  * @generated

  */

-public class UMLMarkerNavigationProvider

-		extends AbstractModelMarkerNavigationProvider {

+public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationProvider {

 

 	/**

 	 * @generated

@@ -53,8 +52,7 @@ public class UMLMarkerNavigationProvider
 		}

 		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,16 +63,14 @@ public class UMLMarkerNavigationProvider
 		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$

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public static IMarker addMarker(IFile file,

-			String elementId, String location, String message, int statusSeverity) {

+	public static IMarker addMarker(IFile file, String elementId, String location, String message, int statusSeverity) {

 		IMarker marker = null;

 		try {

 			marker = file.createMarker(MARKER_TYPE);

@@ -84,14 +80,12 @@ public class UMLMarkerNavigationProvider
 			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.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java
index 9512bb89d9e..a143aae4582 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java
@@ -47,9 +47,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getActivity_NameLabel_Parser() {

 		if (activity_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -69,9 +67,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getActivity_FloatingNameLabel_Parser() {

 		if (activity_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			activity_FloatingNameLabel_Parser = parser;

 		}

@@ -88,9 +84,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInteraction_NameLabel_Parser() {

 		if (interaction_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -110,9 +104,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInteraction_FloatingNameLabel_Parser() {

 		if (interaction_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interaction_FloatingNameLabel_Parser = parser;

 		}

@@ -129,9 +121,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getProtocolStateMachine_NameLabel_Parser() {

 		if (protocolStateMachine_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -151,9 +141,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getProtocolStateMachine_FloatingNameLabel_Parser() {

 		if (protocolStateMachine_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			protocolStateMachine_FloatingNameLabel_Parser = parser;

 		}

@@ -170,9 +158,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getStateMachine_NameLabel_Parser() {

 		if (stateMachine_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -192,9 +178,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getStateMachine_FloatingNameLabel_Parser() {

 		if (stateMachine_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			stateMachine_FloatingNameLabel_Parser = parser;

 		}

@@ -211,9 +195,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getFunctionBehavior_NameLabel_Parser() {

 		if (functionBehavior_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -233,9 +215,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getFunctionBehavior_FloatingNameLabel_Parser() {

 		if (functionBehavior_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			functionBehavior_FloatingNameLabel_Parser = parser;

 		}

@@ -252,9 +232,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getOpaqueBehavior_NameLabel_Parser() {

 		if (opaqueBehavior_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -274,9 +252,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getOpaqueBehavior_FloatingNameLabel_Parser() {

 		if (opaqueBehavior_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			opaqueBehavior_FloatingNameLabel_Parser = parser;

 		}

@@ -293,9 +269,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getComponent_NameLabel_Parser() {

 		if (component_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -315,9 +289,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getComponent_FloatingNameLabel_Parser() {

 		if (component_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			component_FloatingNameLabel_Parser = parser;

 		}

@@ -334,9 +306,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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -356,9 +326,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDevice_FloatingNameLabel_Parser() {

 		if (device_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			device_FloatingNameLabel_Parser = parser;

 		}

@@ -375,9 +343,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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -397,9 +363,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getExecutionEnvironment_FloatingNameLabel_Parser() {

 		if (executionEnvironment_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			executionEnvironment_FloatingNameLabel_Parser = parser;

 		}

@@ -416,9 +380,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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -438,9 +400,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getNode_FloatingNameLabel_Parser() {

 		if (node_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			node_FloatingNameLabel_Parser = parser;

 		}

@@ -457,9 +417,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getClass_NameLabel_Parser() {

 		if (class_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -479,9 +437,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getClass_FloatingNameLabel_Parser() {

 		if (class_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			class_FloatingNameLabel_Parser = parser;

 		}

@@ -498,9 +454,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCollaboration_NameLabel_Parser() {

 		if (collaboration_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -520,9 +474,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCollaboration_FloatingNameLabel_Parser() {

 		if (collaboration_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			collaboration_FloatingNameLabel_Parser = parser;

 		}

@@ -539,9 +491,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInterface_NameLabel_Parser() {

 		if (interface_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -561,9 +511,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInterface_FloatingNameLabel_Parser() {

 		if (interface_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interface_FloatingNameLabel_Parser = parser;

 		}

@@ -580,9 +528,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getPrimitiveType_NameLabel_Parser() {

 		if (primitiveType_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -602,9 +548,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getPrimitiveType_FloatingNameLabel_Parser() {

 		if (primitiveType_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			primitiveType_FloatingNameLabel_Parser = parser;

 		}

@@ -621,9 +565,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getEnumeration_NameLabel_Parser() {

 		if (enumeration_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -643,9 +585,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getEnumeration_FloatingNameLabel_Parser() {

 		if (enumeration_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			enumeration_FloatingNameLabel_Parser = parser;

 		}

@@ -662,9 +602,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDataType_NameLabel_Parser() {

 		if (dataType_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -684,9 +622,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDataType_FloatingNameLabel_Parser() {

 		if (dataType_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			dataType_FloatingNameLabel_Parser = parser;

 		}

@@ -703,9 +639,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getActor_NameLabel_Parser() {

 		if (actor_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -725,9 +659,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getActor_FloatingNameLabel_Parser() {

 		if (actor_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			actor_FloatingNameLabel_Parser = parser;

 		}

@@ -744,9 +676,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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -766,9 +696,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;

 		}

@@ -785,9 +713,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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -807,9 +733,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;

 		}

@@ -826,9 +750,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInformationItem_NameLabel_Parser() {

 		if (informationItem_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -848,9 +770,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInformationItem_FloatingNameLabel_Parser() {

 		if (informationItem_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			informationItem_FloatingNameLabel_Parser = parser;

 		}

@@ -867,9 +787,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getSignal_NameLabel_Parser() {

 		if (signal_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -889,9 +807,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getSignal_FloatingNameLabel_Parser() {

 		if (signal_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			signal_FloatingNameLabel_Parser = parser;

 		}

@@ -908,9 +824,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getUseCase_NameLabel_Parser() {

 		if (useCase_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -930,9 +844,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getUseCase_FloatingNameLabel_Parser() {

 		if (useCase_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			useCase_FloatingNameLabel_Parser = parser;

 		}

@@ -949,9 +861,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getSignalEvent_NameLabel_Parser() {

 		if (signalEvent_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -971,9 +881,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getSignalEvent_FloatingNameLabel_Parser() {

 		if (signalEvent_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			signalEvent_FloatingNameLabel_Parser = parser;

 		}

@@ -990,9 +898,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCallEvent_NameLabel_Parser() {

 		if (callEvent_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1012,9 +918,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCallEvent_FloatingNameLabel_Parser() {

 		if (callEvent_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			callEvent_FloatingNameLabel_Parser = parser;

 		}

@@ -1031,9 +935,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getAnyReceiveEvent_NameLabel_Parser() {

 		if (anyReceiveEvent_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1053,9 +955,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getAnyReceiveEvent_FloatingNameLabel_Parser() {

 		if (anyReceiveEvent_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			anyReceiveEvent_FloatingNameLabel_Parser = parser;

 		}

@@ -1072,9 +972,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getChangeEvent_NameLabel_Parser() {

 		if (changeEvent_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1094,9 +992,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getChangeEvent_FloatingNameLabel_Parser() {

 		if (changeEvent_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			changeEvent_FloatingNameLabel_Parser = parser;

 		}

@@ -1113,9 +1009,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeEvent_NameLabel_Parser() {

 		if (timeEvent_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1135,9 +1029,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeEvent_FloatingNameLabel_Parser() {

 		if (timeEvent_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeEvent_FloatingNameLabel_Parser = parser;

 		}

@@ -1154,9 +1046,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDurationObservation_NameLabel_Parser() {

 		if (durationObservation_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			durationObservation_NameLabel_Parser = parser;

 		}

@@ -1188,9 +1078,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeObservation_NameLabel_Parser() {

 		if (timeObservation_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeObservation_NameLabel_Parser = parser;

 		}

@@ -1222,9 +1110,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralBoolean_NameLabel_Parser() {

 		if (literalBoolean_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1244,9 +1130,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralBoolean_FloatingNameLabel_Parser() {

 		if (literalBoolean_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			literalBoolean_FloatingNameLabel_Parser = parser;

 		}

@@ -1263,9 +1147,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralInteger_NameLabel_Parser() {

 		if (literalInteger_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1285,9 +1167,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralInteger_FloatingNameLabel_Parser() {

 		if (literalInteger_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			literalInteger_FloatingNameLabel_Parser = parser;

 		}

@@ -1304,9 +1184,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralNull_NameLabel_Parser() {

 		if (literalNull_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1326,9 +1204,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralNull_FloatingNameLabel_Parser() {

 		if (literalNull_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			literalNull_FloatingNameLabel_Parser = parser;

 		}

@@ -1345,9 +1221,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralString_NameLabel_Parser() {

 		if (literalString_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1367,9 +1241,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralString_FloatingNameLabel_Parser() {

 		if (literalString_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			literalString_FloatingNameLabel_Parser = parser;

 		}

@@ -1386,9 +1258,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralUnlimitedNatural_NameLabel_Parser() {

 		if (literalUnlimitedNatural_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1408,9 +1278,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralUnlimitedNatural_FloatingNameLabel_Parser() {

 		if (literalUnlimitedNatural_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			literalUnlimitedNatural_FloatingNameLabel_Parser = parser;

 		}

@@ -1427,9 +1295,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getStringExpression_NameLabel_Parser() {

 		if (stringExpression_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1449,9 +1315,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getStringExpression_FloatingNameLabel_Parser() {

 		if (stringExpression_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			stringExpression_FloatingNameLabel_Parser = parser;

 		}

@@ -1468,9 +1332,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getOpaqueExpression_NameLabel_Parser() {

 		if (opaqueExpression_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1490,9 +1352,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getOpaqueExpression_FloatingNameLabel_Parser() {

 		if (opaqueExpression_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			opaqueExpression_FloatingNameLabel_Parser = parser;

 		}

@@ -1509,9 +1369,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeExpression_NameLabel_Parser() {

 		if (timeExpression_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1531,9 +1389,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeExpression_FloatingNameLabel_Parser() {

 		if (timeExpression_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeExpression_FloatingNameLabel_Parser = parser;

 		}

@@ -1550,9 +1406,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getExpression_NameLabel_Parser() {

 		if (expression_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1572,9 +1426,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getExpression_FloatingNameLabel_Parser() {

 		if (expression_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			expression_FloatingNameLabel_Parser = parser;

 		}

@@ -1591,9 +1443,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDuration_NameLabel_Parser() {

 		if (duration_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1613,9 +1463,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDuration_FloatingNameLabel_Parser() {

 		if (duration_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			duration_FloatingNameLabel_Parser = parser;

 		}

@@ -1632,9 +1480,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeInterval_NameLabel_Parser() {

 		if (timeInterval_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1654,9 +1500,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeInterval_FloatingNameLabel_Parser() {

 		if (timeInterval_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeInterval_FloatingNameLabel_Parser = parser;

 		}

@@ -1673,9 +1517,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDurationInterval_NameLabel_Parser() {

 		if (durationInterval_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1695,9 +1537,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDurationInterval_FloatingNameLabel_Parser() {

 		if (durationInterval_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			durationInterval_FloatingNameLabel_Parser = parser;

 		}

@@ -1714,9 +1554,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInterval_NameLabel_Parser() {

 		if (interval_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1736,9 +1574,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInterval_FloatingNameLabel_Parser() {

 		if (interval_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interval_FloatingNameLabel_Parser = parser;

 		}

@@ -1755,9 +1591,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInstanceValue_NameLabel_Parser() {

 		if (instanceValue_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1777,9 +1611,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInstanceValue_FloatingNameLabel_Parser() {

 		if (instanceValue_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			instanceValue_FloatingNameLabel_Parser = parser;

 		}

@@ -1811,9 +1643,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDurationConstraint_NameLabel_Parser() {

 		if (durationConstraint_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			durationConstraint_NameLabel_Parser = parser;

 		}

@@ -1845,9 +1675,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeConstraint_NameLabel_Parser() {

 		if (timeConstraint_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeConstraint_NameLabel_Parser = parser;

 		}

@@ -1879,9 +1707,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getIntervalConstraint_NameLabel_Parser() {

 		if (intervalConstraint_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			intervalConstraint_NameLabel_Parser = parser;

 		}

@@ -1913,9 +1739,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInteractionConstraint_NameLabel_Parser() {

 		if (interactionConstraint_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interactionConstraint_NameLabel_Parser = parser;

 		}

@@ -1947,9 +1771,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;

 		}

@@ -1981,9 +1803,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getPort_BehaviorFloatingNameLabel_Parser() {

 		if (port_BehaviorFloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			port_BehaviorFloatingNameLabel_Parser = parser;

 		}

@@ -2000,9 +1820,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getPort_NameLabel_Parser() {

 		if (port_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			port_NameLabel_Parser = parser;

 		}

@@ -2034,9 +1852,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getParameter_NameLabel_Parser() {

 		if (parameter_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parameter_NameLabel_Parser = parser;

 		}

@@ -2068,9 +1884,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getProperty_NameLabel_Parser() {

 		if (property_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			property_NameLabel_Parser = parser;

 		}

@@ -2087,9 +1901,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getProperty_FloatingNameLabel_Parser() {

 		if (property_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			property_FloatingNameLabel_Parser = parser;

 		}

@@ -2106,9 +1918,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConnectableElement_CollaborationRoleNameLabel_Parser() {

 		if (connectableElement_CollaborationRoleNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}"); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2128,9 +1938,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConnectableElement_CollaborationRoleFloatingNameLabel_Parser() {

 		if (connectableElement_CollaborationRoleFloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			connectableElement_CollaborationRoleFloatingNameLabel_Parser = parser;

 		}

@@ -2147,9 +1955,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCollaborationUse_NameLabel_Parser() {

 		if (collaborationUse_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			collaborationUse_NameLabel_Parser = parser;

 		}

@@ -2166,9 +1972,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCollaborationUse_FloatingNameLabel_Parser() {

 		if (collaborationUse_FloatingNameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			collaborationUse_FloatingNameLabel_Parser = parser;

 		}

@@ -2185,9 +1989,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getActivity_NameLabel_CN_Parser() {

 		if (activity_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2207,9 +2009,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getActivity_FloatingNameLabel_CN_Parser() {

 		if (activity_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);

 			activity_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2226,9 +2026,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInteraction_NameLabel_CN_Parser() {

 		if (interaction_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2248,9 +2046,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInteraction_FloatingNameLabel_CN_Parser() {

 		if (interaction_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);

 			interaction_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2267,9 +2063,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getProtocolStateMachine_NameLabel_CN_Parser() {

 		if (protocolStateMachine_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2289,9 +2083,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getProtocolStateMachine_FloatingNameLabel_CN_Parser() {

 		if (protocolStateMachine_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);

 			protocolStateMachine_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2308,9 +2100,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getStateMachine_NameLabel_CN_Parser() {

 		if (stateMachine_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2330,9 +2120,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getStateMachine_FloatingNameLabel_CN_Parser() {

 		if (stateMachine_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);

 			stateMachine_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2349,9 +2137,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getFunctionBehavior_NameLabel_CN_Parser() {

 		if (functionBehavior_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2371,9 +2157,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getFunctionBehavior_FloatingNameLabel_CN_Parser() {

 		if (functionBehavior_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);

 			functionBehavior_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2390,9 +2174,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getOpaqueBehavior_NameLabel_CN_Parser() {

 		if (opaqueBehavior_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2412,9 +2194,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getOpaqueBehavior_FloatingNameLabel_CN_Parser() {

 		if (opaqueBehavior_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);

 			opaqueBehavior_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2431,9 +2211,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getComponent_NameLabel_CN_Parser() {

 		if (component_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2453,9 +2231,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getComponent_FloatingNameLabel_CN_Parser() {

 		if (component_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);

 			component_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2472,9 +2248,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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2494,9 +2268,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDevice_FloatingNameLabel_CN_Parser() {

 		if (device_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);

 			device_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2513,9 +2285,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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2535,9 +2305,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getExecutionEnvironment_FloatingNameLabel_CN_Parser() {

 		if (executionEnvironment_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);

 			executionEnvironment_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2554,9 +2322,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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2576,9 +2342,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getNode_FloatingNameLabel_CN_Parser() {

 		if (node_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);

 			node_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2595,9 +2359,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getClass_NameLabel_CN_Parser() {

 		if (class_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2617,9 +2379,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getClass_FloatingNameLabel_CN_Parser() {

 		if (class_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);

 			class_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2636,9 +2396,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCollaboration_NameLabel_CN_Parser() {

 		if (collaboration_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2658,9 +2416,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCollaboration_FloatingNameLabel_CN_Parser() {

 		if (collaboration_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);

 			collaboration_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2677,9 +2433,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInterface_NameLabel_CN_Parser() {

 		if (interface_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2699,9 +2453,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInterface_FloatingNameLabel_CN_Parser() {

 		if (interface_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);

 			interface_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2718,9 +2470,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getPrimitiveType_NameLabel_CN_Parser() {

 		if (primitiveType_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2740,9 +2490,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getPrimitiveType_FloatingNameLabel_CN_Parser() {

 		if (primitiveType_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);

 			primitiveType_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2759,9 +2507,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getEnumeration_NameLabel_CN_Parser() {

 		if (enumeration_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2781,9 +2527,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getEnumeration_FloatingNameLabel_CN_Parser() {

 		if (enumeration_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);

 			enumeration_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2800,9 +2544,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDataType_NameLabel_CN_Parser() {

 		if (dataType_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2822,9 +2564,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDataType_FloatingNameLabel_CN_Parser() {

 		if (dataType_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);

 			dataType_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2841,9 +2581,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getActor_NameLabel_CN_Parser() {

 		if (actor_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2863,9 +2601,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getActor_FloatingNameLabel_CN_Parser() {

 		if (actor_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);

 			actor_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2882,9 +2618,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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2904,9 +2638,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;

 		}

@@ -2923,9 +2655,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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2945,9 +2675,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getArtifact_FloatingNameLabel_CN_Parser() {

 		if (artifact_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);

 			artifact_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -2964,9 +2692,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInformationItem_NameLabel_CN_Parser() {

 		if (informationItem_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2986,9 +2712,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInformationItem_FloatingNameLabel_CN_Parser() {

 		if (informationItem_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);

 			informationItem_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -3005,9 +2729,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getSignal_NameLabel_CN_Parser() {

 		if (signal_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -3027,9 +2749,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getSignal_FloatingNameLabel_CN_Parser() {

 		if (signal_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);

 			signal_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -3046,9 +2766,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getUseCase_NameLabel_CN_Parser() {

 		if (useCase_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);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -3068,9 +2786,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getUseCase_FloatingNameLabel_CN_Parser() {

 		if (useCase_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);

 			useCase_FloatingNameLabel_CN_Parser = parser;

 		}

@@ -3102,9 +2818,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDurationConstraint_NameLabel_CN_Parser() {

 		if (durationConstraint_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);

 			durationConstraint_NameLabel_CN_Parser = parser;

 		}

@@ -3136,9 +2850,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeConstraint_NameLabel_CN_Parser() {

 		if (timeConstraint_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);

 			timeConstraint_NameLabel_CN_Parser = parser;

 		}

@@ -3170,9 +2882,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getIntervalConstraint_NameLabel_CN_Parser() {

 		if (intervalConstraint_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);

 			intervalConstraint_NameLabel_CN_Parser = parser;

 		}

@@ -3204,9 +2914,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInteractionConstraint_NameLabel_CN_Parser() {

 		if (interactionConstraint_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);

 			interactionConstraint_NameLabel_CN_Parser = parser;

 		}

@@ -3238,9 +2946,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;

 		}

@@ -3272,9 +2978,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getProperty_AttributeLabel_Parser() {

 		if (property_AttributeLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -3294,9 +2998,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getOperation_OperationLabel_Parser() {

 		if (operation_OperationLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -3316,9 +3018,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getEnumerationLiteral_LiteralLabel_Parser() {

 		if (enumerationLiteral_LiteralLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -3338,9 +3038,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getComponentRealization_NameLabel_Parser() {

 		if (componentRealization_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			componentRealization_NameLabel_Parser = parser;

 		}

@@ -3372,9 +3070,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInterfaceRealization_NameLabel_Parser() {

 		if (interfaceRealization_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interfaceRealization_NameLabel_Parser = parser;

 		}

@@ -3406,9 +3102,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getSubstitution_NameLabel_Parser() {

 		if (substitution_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			substitution_NameLabel_Parser = parser;

 		}

@@ -3440,9 +3134,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getRealization_NameLabel_Parser() {

 		if (realization_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			realization_NameLabel_Parser = parser;

 		}

@@ -3474,9 +3166,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;

 		}

@@ -3508,9 +3198,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getAbstraction_NameLabel_Parser() {

 		if (abstraction_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			abstraction_NameLabel_Parser = parser;

 		}

@@ -3542,9 +3230,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getUsage_NameLabel_Parser() {

 		if (usage_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			usage_NameLabel_Parser = parser;

 		}

@@ -3576,9 +3262,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;

 		}

@@ -3640,9 +3324,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;

 		}

@@ -3689,9 +3371,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConnector_NameLabel_Parser() {

 		if (connector_NameLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			connector_NameLabel_Parser = parser;

 		}

@@ -3708,9 +3388,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConnector_SourceMultiplicityLabel_Parser() {

 		if (connector_SourceMultiplicityLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("sourceMul{0}"); //$NON-NLS-1$

 			parser.setEditorPattern("sourceMul{0}"); //$NON-NLS-1$

@@ -3730,9 +3408,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConnector_TargetMultiplicityLabel_Parser() {

 		if (connector_TargetMultiplicityLabel_Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("targetMul{0}"); //$NON-NLS-1$

 			parser.setEditorPattern("targetMul{0}"); //$NON-NLS-1$

@@ -4209,9 +3885,6 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 			case EnumerationLiteralEditPartCLN.VISUAL_ID:

 				return getEnumerationLiteral_LiteralLabel_Parser();

 

-

-

-

 			case ComponentRealizationNameEditPart.VISUAL_ID:

 				return getComponentRealization_NameLabel_Parser();

 			case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:

@@ -4274,9 +3947,6 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 			case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:

 				return getGeneralization_StereotypeLabel_Parser();

 

-

-

-

 			case InformationFlowAppliedStereotypeEditPart.VISUAL_ID:

 				return getInformationFlow_StereotypeLabel_Parser();

 			case InformationFlowNameEditPart.VISUAL_ID:

@@ -4299,8 +3969,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	/**

 	 * @generated

 	 */

-	public IParser getParser(

-			IAdaptable hint) {

+	public IParser getParser(IAdaptable hint) {

 		String vid = (String) hint.getAdapter(String.class);

 		if (vid != null) {

 			return getParser(UMLVisualIDRegistry.getVisualID(vid));

@@ -4339,8 +4008,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 		/**

 		 * @generated

 		 */

-		public HintAdapter(IElementType type,

-				EObject object, String parserHint) {

+		public HintAdapter(IElementType type, EObject object, String parserHint) {

 			super(object, parserHint);

 			assert type != null;

 			elementType = type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java
index d9f923eaf68..bafcd17011f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java
@@ -30,17 +30,14 @@ import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
 /**

  * @generated

  */

-public class UMLValidationDecoratorProvider

-		extends ValidationDecoratorProvider

-		implements IDecoratorProvider {

+public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider implements IDecoratorProvider {

 

 	/**

 	 * @generated

 	 */

 	public void createDecorators(IDecoratorTarget decoratorTarget) {

 		EditPart editPart = (EditPart) decoratorTarget.getAdapter(EditPart.class);

-		if (editPart instanceof GraphicalEditPart ||

-				editPart instanceof AbstractConnectionEditPart) {

+		if (editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) {

 			Object model = editPart.getModel();

 			if ((model instanceof View)) {

 				View view = (View) model;

@@ -66,10 +63,8 @@ public class UMLValidationDecoratorProvider
 			return false;

 		}

 		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget();

-		View view = (View) decoratorTarget.getAdapter(

-				View.class);

+		View view = (View) decoratorTarget.getAdapter(View.class);

 		return view != null && CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));

 	}

 

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java
index 7c01734d040..79c99147201 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java
@@ -69,12 +69,10 @@ public class UMLValidationProvider {
 			return false;

 		}

 		if (object instanceof View) {

-			return constraintsActive && CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View) object));

+			return constraintsActive

+					&& CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View) object));

 		}

 		return true;

 	}

 

-

-

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
index e914b377fc3..9474a12babd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
@@ -89,11 +89,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());

@@ -114,13 +114,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 CompositeStructureDiagramEditPart.MODEL_ID;

 	}

 

@@ -128,7 +128,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected boolean provides(CreateDiagramViewOperation op) {

-		return CompositeStructureDiagramEditPart.MODEL_ID.equals(op.getSemanticHint()) && UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != null

+		return CompositeStructureDiagramEditPart.MODEL_ID.equals(op.getSemanticHint())

+				&& UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != null

 				&& !UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())).isEmpty();

 	}

 

@@ -162,11 +163,12 @@ 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.composite.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.composite.part.UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) {

+				//	return false; // visual id for node EClass should match visual id from element type

+				//}

 			} else {

-				if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) {

+				if (!CompositeStructureDiagramEditPart.MODEL_ID

+						.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) {

 					return false; // foreign diagram

 				}

 				if (visualID != null) {

@@ -258,7 +260,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 					case ConstraintEditPartCN.VISUAL_ID:

 					case PropertyEditPartCLN.VISUAL_ID:

 					case OperationEditPartCLN.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;

@@ -283,18 +286,18 @@ 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.composite.part.UMLVisualIDRegistry.getVisualID(elementTypeHint);

-		// org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter());

-		// if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.composite.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.composite.part.UMLVisualIDRegistry.getVisualID(elementTypeHint);

+		//org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter());

+		//if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getLinkWithClassVisualID(domainElement))) {

+		//	return false; // visual id for link EClass should match visual id from element type

+		//}

 		return true;

 	}

 

-

 	/**

 	 * @generated

 	 */

@@ -312,7 +315,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	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) {

@@ -327,7 +331,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case InteractionCompositeEditPart.VISUAL_ID:

 				return createInteraction_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

-				return createProtocolStateMachine_Shape(domainElement, containerView, index, persisted, preferencesHint);

+				return createProtocolStateMachine_Shape(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case StateMachineCompositeEditPart.VISUAL_ID:

 				return createStateMachine_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case FunctionBehaviorCompositeEditPart.VISUAL_ID:

@@ -339,7 +344,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case DeviceCompositeEditPart.VISUAL_ID:

 				return createDevice_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

-				return createExecutionEnvironment_Shape(domainElement, containerView, index, persisted, preferencesHint);

+				return createExecutionEnvironment_Shape(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case NodeCompositeEditPart.VISUAL_ID:

 				return createNode_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case ClassCompositeEditPart.VISUAL_ID:

@@ -357,7 +363,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case ActorEditPart.VISUAL_ID:

 				return createActor_Shape(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 ArtifactEditPart.VISUAL_ID:

 				return createArtifact_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case InformationItemEditPart.VISUAL_ID:

@@ -389,9 +396,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case LiteralStringEditPart.VISUAL_ID:

 				return createLiteralString_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

-				return createLiteralUnlimitedNatural_Shape(domainElement, containerView, index, persisted, preferencesHint);

+				return createLiteralUnlimitedNatural_Shape(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case StringExpressionEditPart.VISUAL_ID:

-				return createStringExpression_PackagedElementShape(domainElement, containerView, index, persisted, preferencesHint);

+				return createStringExpression_PackagedElementShape(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case OpaqueExpressionEditPart.VISUAL_ID:

 				return createOpaqueExpression_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case TimeExpressionEditPart.VISUAL_ID:

@@ -417,7 +426,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case IntervalConstraintEditPart.VISUAL_ID:

 				return createIntervalConstraint_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case InteractionConstraintEditPart.VISUAL_ID:

-				return createInteractionConstraint_Shape(domainElement, containerView, index, persisted, preferencesHint);

+				return createInteractionConstraint_Shape(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case ConstraintEditPart.VISUAL_ID:

 				return createConstraint_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case BehaviorPortEditPart.VISUAL_ID:

@@ -429,7 +439,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case PropertyPartEditPartCN.VISUAL_ID:

 				return createProperty_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case CollaborationRoleEditPartCN.VISUAL_ID:

-				return createConnectableElement_CollaborationRoleShape(domainElement, containerView, index, persisted, preferencesHint);

+				return createConnectableElement_CollaborationRoleShape(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case CollaborationUseEditPartCN.VISUAL_ID:

 				return createCollaborationUse_Shape(domainElement, containerView, index, persisted, preferencesHint);

 			case ActivityCompositeEditPartCN.VISUAL_ID:

@@ -437,7 +448,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case InteractionCompositeEditPartCN.VISUAL_ID:

 				return createInteraction_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

-				return createProtocolStateMachine_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

+				return createProtocolStateMachine_Shape_CN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case StateMachineCompositeEditPartCN.VISUAL_ID:

 				return createStateMachine_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

@@ -449,7 +461,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case DeviceCompositeEditPartCN.VISUAL_ID:

 				return createDevice_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

-				return createExecutionEnvironment_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

+				return createExecutionEnvironment_Shape_CN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case NodeCompositeEditPartCN.VISUAL_ID:

 				return createNode_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case ClassCompositeEditPartCN.VISUAL_ID:

@@ -467,7 +480,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case ActorEditPartCN.VISUAL_ID:

 				return createActor_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case DeploymentSpecificationEditPartCN.VISUAL_ID:

-				return createDeploymentSpecification_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

+				return createDeploymentSpecification_Shape_CN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case ArtifactEditPartCN.VISUAL_ID:

 				return createArtifact_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case InformationItemEditPartCN.VISUAL_ID:

@@ -479,13 +493,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case CommentEditPartCN.VISUAL_ID:

 				return createComment_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case DurationConstraintEditPartCN.VISUAL_ID:

-				return createDurationConstraint_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

+				return createDurationConstraint_Shape_CN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case TimeConstraintEditPartCN.VISUAL_ID:

 				return createTimeConstraint_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case IntervalConstraintEditPartCN.VISUAL_ID:

-				return createIntervalConstraint_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

+				return createIntervalConstraint_Shape_CN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case InteractionConstraintEditPartCN.VISUAL_ID:

-				return createInteractionConstraint_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

+				return createInteractionConstraint_Shape_CN(domainElement, containerView, index, persisted,

+						preferencesHint);

 			case ConstraintEditPartCN.VISUAL_ID:

 				return createConstraint_Shape_CN(domainElement, containerView, index, persisted, preferencesHint);

 			case PropertyEditPartCLN.VISUAL_ID:

@@ -493,7 +510,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case OperationEditPartCLN.VISUAL_ID:

 				return createOperation_OperationLabel(domainElement, containerView, index, persisted, preferencesHint);

 			case EnumerationLiteralEditPartCLN.VISUAL_ID:

-				return createEnumerationLiteral_LiteralLabel(domainElement, containerView, index, persisted, preferencesHint);

+				return createEnumerationLiteral_LiteralLabel(domainElement, containerView, index, persisted,

+						preferencesHint);

 			}

 		}

 		// can't happen, provided #provides(CreateNodeViewOperation) is correct

@@ -503,7 +521,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	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);

@@ -518,29 +537,41 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case ConstraintConstrainedElementEditPart.VISUAL_ID:

 				return createConstraint_ConstrainedElementEdge(containerView, index, persisted, preferencesHint);

 			case ComponentRealizationEditPart.VISUAL_ID:

-				return createComponentRealization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createComponentRealization_Edge(getSemanticElement(semanticAdapter), containerView, index,

+						persisted, preferencesHint);

 			case InterfaceRealizationEditPart.VISUAL_ID:

-				return createInterfaceRealization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createInterfaceRealization_Edge(getSemanticElement(semanticAdapter), containerView, index,

+						persisted, preferencesHint);

 			case SubstitutionEditPart.VISUAL_ID:

-				return createSubstitution_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createSubstitution_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted,

+						preferencesHint);

 			case RealizationEditPart.VISUAL_ID:

-				return createRealization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createRealization_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 AbstractionEditPart.VISUAL_ID:

-				return createAbstraction_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createAbstraction_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted,

+						preferencesHint);

 			case UsageEditPart.VISUAL_ID:

-				return createUsage_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createUsage_Edge(getSemanticElement(semanticAdapter), 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 RoleBindingEditPart.VISUAL_ID:

-				return createDependency_RoleBindingEdge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createDependency_RoleBindingEdge(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 ConnectorEditPart.VISUAL_ID:

-				return createConnector_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createConnector_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 TimeObservationEventEditPart.VISUAL_ID:

 				return createTimeObservation_EventEdge(containerView, index, persisted, preferencesHint);

 			case DurationObservationEventEditPart.VISUAL_ID:

@@ -548,7 +579,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			case RepresentationEditPart.VISUAL_ID:

 				return createRepresentation_Edge(containerView, index, persisted, preferencesHint);

 			case InformationFlowEditPart.VISUAL_ID:

-				return createInformationFlow_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+				return createInformationFlow_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted,

+						preferencesHint);

 			}

 		}

 		// can never happen, provided #provides(CreateEdgeViewOperation) is correct

@@ -558,24 +590,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createActivity_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createActivity_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(ActivityCompositeEditPart.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, "Activity");

-		Node activity_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeNameEditPart.VISUAL_ID));

-		Node activity_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeFloatingLabelEditPart.VISUAL_ID));

+		Node activity_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ActivityCompositeNameEditPart.VISUAL_ID));

+		Node activity_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ActivityCompositeFloatingLabelEditPart.VISUAL_ID));

 		activity_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location activity_FloatingNameLabel_Location = (Location) activity_FloatingNameLabel.getLayoutConstraint();

 		activity_FloatingNameLabel_Location.setX(0);

 		activity_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ActivityCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ActivityCompositeCompartmentEditPart.VISUAL_ID), true, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Activity");

 		return node;

 	}

@@ -583,24 +619,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createInteraction_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInteraction_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(InteractionCompositeEditPart.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, "Interaction");

-		Node interaction_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeNameEditPart.VISUAL_ID));

-		Node interaction_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeFloatingLabelEditPart.VISUAL_ID));

+		Node interaction_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(InteractionCompositeNameEditPart.VISUAL_ID));

+		Node interaction_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(InteractionCompositeFloatingLabelEditPart.VISUAL_ID));

 		interaction_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location interaction_FloatingNameLabel_Location = (Location) interaction_FloatingNameLabel.getLayoutConstraint();

+		Location interaction_FloatingNameLabel_Location = (Location) interaction_FloatingNameLabel

+				.getLayoutConstraint();

 		interaction_FloatingNameLabel_Location.setX(0);

 		interaction_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(InteractionCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(InteractionCompositeCompartmentEditPart.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interaction");

 		return node;

 	}

@@ -608,24 +649,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createProtocolStateMachine_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createProtocolStateMachine_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(ProtocolStateMachineCompositeEditPart.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, "ProtocolStateMachine");

-		Node protocolStateMachine_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));

-		Node protocolStateMachine_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeFloatingLabelEditPart.VISUAL_ID));

+		Node protocolStateMachine_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));

+		Node protocolStateMachine_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeFloatingLabelEditPart.VISUAL_ID));

 		protocolStateMachine_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location protocolStateMachine_FloatingNameLabel_Location = (Location) protocolStateMachine_FloatingNameLabel.getLayoutConstraint();

+		Location protocolStateMachine_FloatingNameLabel_Location = (Location) protocolStateMachine_FloatingNameLabel

+				.getLayoutConstraint();

 		protocolStateMachine_FloatingNameLabel_Location.setX(0);

 		protocolStateMachine_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID),

+				true, true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ProtocolStateMachine");

 		return node;

 	}

@@ -633,24 +679,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createStateMachine_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createStateMachine_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(StateMachineCompositeEditPart.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, "StateMachine");

-		Node stateMachine_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPart.VISUAL_ID));

-		Node stateMachine_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeFloatingLabelEditPart.VISUAL_ID));

+		Node stateMachine_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPart.VISUAL_ID));

+		Node stateMachine_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(StateMachineCompositeFloatingLabelEditPart.VISUAL_ID));

 		stateMachine_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location stateMachine_FloatingNameLabel_Location = (Location) stateMachine_FloatingNameLabel.getLayoutConstraint();

+		Location stateMachine_FloatingNameLabel_Location = (Location) stateMachine_FloatingNameLabel

+				.getLayoutConstraint();

 		stateMachine_FloatingNameLabel_Location.setX(0);

 		stateMachine_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(StateMachineCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(StateMachineCompositeCompartmentEditPart.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "StateMachine");

 		return node;

 	}

@@ -658,24 +709,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createFunctionBehavior_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createFunctionBehavior_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(FunctionBehaviorCompositeEditPart.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, "FunctionBehavior");

-		Node functionBehavior_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPart.VISUAL_ID));

-		Node functionBehavior_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeFloatingLabelEditPart.VISUAL_ID));

+		Node functionBehavior_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPart.VISUAL_ID));

+		Node functionBehavior_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(FunctionBehaviorCompositeFloatingLabelEditPart.VISUAL_ID));

 		functionBehavior_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location functionBehavior_FloatingNameLabel_Location = (Location) functionBehavior_FloatingNameLabel.getLayoutConstraint();

+		Location functionBehavior_FloatingNameLabel_Location = (Location) functionBehavior_FloatingNameLabel

+				.getLayoutConstraint();

 		functionBehavior_FloatingNameLabel_Location.setX(0);

 		functionBehavior_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID),

+				true, true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "FunctionBehavior");

 		return node;

 	}

@@ -683,24 +739,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createOpaqueBehavior_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createOpaqueBehavior_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(OpaqueBehaviorCompositeEditPart.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, "OpaqueBehavior");

-		Node opaqueBehavior_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));

-		Node opaqueBehavior_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeFloatingLabelEditPart.VISUAL_ID));

+		Node opaqueBehavior_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));

+		Node opaqueBehavior_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeFloatingLabelEditPart.VISUAL_ID));

 		opaqueBehavior_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location opaqueBehavior_FloatingNameLabel_Location = (Location) opaqueBehavior_FloatingNameLabel.getLayoutConstraint();

+		Location opaqueBehavior_FloatingNameLabel_Location = (Location) opaqueBehavior_FloatingNameLabel

+				.getLayoutConstraint();

 		opaqueBehavior_FloatingNameLabel_Location.setX(0);

 		opaqueBehavior_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "OpaqueBehavior");

 		return node;

 	}

@@ -708,24 +769,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createComponent_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createComponent_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(ComponentCompositeEditPart.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, "Component");

-		Node component_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeNameEditPart.VISUAL_ID));

-		Node component_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeFloatingLabelEditPart.VISUAL_ID));

+		Node component_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ComponentCompositeNameEditPart.VISUAL_ID));

+		Node component_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ComponentCompositeFloatingLabelEditPart.VISUAL_ID));

 		component_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location component_FloatingNameLabel_Location = (Location) component_FloatingNameLabel.getLayoutConstraint();

 		component_FloatingNameLabel_Location.setX(0);

 		component_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPart.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

 		return node;

 	}

@@ -733,24 +798,27 @@ 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(DeviceCompositeEditPart.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(DeviceCompositeNameEditPart.VISUAL_ID));

-		Node device_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(DeviceCompositeFloatingLabelEditPart.VISUAL_ID));

+		Node device_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DeviceCompositeFloatingLabelEditPart.VISUAL_ID));

 		device_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location device_FloatingNameLabel_Location = (Location) device_FloatingNameLabel.getLayoutConstraint();

 		device_FloatingNameLabel_Location.setX(0);

 		device_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPart.VISUAL_ID), true, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Device");

 		return node;

 	}

@@ -758,24 +826,29 @@ 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(ExecutionEnvironmentCompositeEditPart.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(ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));

-		Node executionEnvironment_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeFloatingLabelEditPart.VISUAL_ID));

+		Node executionEnvironment_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));

+		Node executionEnvironment_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeFloatingLabelEditPart.VISUAL_ID));

 		executionEnvironment_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location executionEnvironment_FloatingNameLabel_Location = (Location) executionEnvironment_FloatingNameLabel.getLayoutConstraint();

+		Location executionEnvironment_FloatingNameLabel_Location = (Location) executionEnvironment_FloatingNameLabel

+				.getLayoutConstraint();

 		executionEnvironment_FloatingNameLabel_Location.setX(0);

 		executionEnvironment_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID),

+				true, true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ExecutionEnvironment");

 		return node;

 	}

@@ -783,24 +856,27 @@ 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(NodeCompositeEditPart.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(NodeCompositeNameEditPart.VISUAL_ID));

-		Node node_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(NodeCompositeFloatingLabelEditPart.VISUAL_ID));

+		Node node_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(NodeCompositeFloatingLabelEditPart.VISUAL_ID));

 		node_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location node_FloatingNameLabel_Location = (Location) node_FloatingNameLabel.getLayoutConstraint();

 		node_FloatingNameLabel_Location.setX(0);

 		node_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPart.VISUAL_ID), true, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Node");

 		return node;

 	}

@@ -808,24 +884,27 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createClass_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createClass_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(ClassCompositeEditPart.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, "Class");

 		Node class_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeNameEditPart.VISUAL_ID));

-		Node class_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeFloatingLabelEditPart.VISUAL_ID));

+		Node class_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ClassCompositeFloatingLabelEditPart.VISUAL_ID));

 		class_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location class_FloatingNameLabel_Location = (Location) class_FloatingNameLabel.getLayoutConstraint();

 		class_FloatingNameLabel_Location.setX(0);

 		class_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ClassCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ClassCompositeCompartmentEditPart.VISUAL_ID), true, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");

 		return node;

 	}

@@ -833,24 +912,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createCollaboration_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createCollaboration_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(CollaborationCompositeEditPart.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, "Collaboration");

-		Node collaboration_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPart.VISUAL_ID));

-		Node collaboration_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeFloatingLabelEditPart.VISUAL_ID));

+		Node collaboration_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPart.VISUAL_ID));

+		Node collaboration_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(CollaborationCompositeFloatingLabelEditPart.VISUAL_ID));

 		collaboration_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location collaboration_FloatingNameLabel_Location = (Location) collaboration_FloatingNameLabel.getLayoutConstraint();

+		Location collaboration_FloatingNameLabel_Location = (Location) collaboration_FloatingNameLabel

+				.getLayoutConstraint();

 		collaboration_FloatingNameLabel_Location.setX(0);

 		collaboration_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(CollaborationCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(CollaborationCompositeCompartmentEditPart.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Collaboration");

 		return node;

 	}

@@ -858,19 +942,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createInterface_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInterface_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(InterfaceEditPart.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, "Interface");

 		Node interface_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));

-		Node interface_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(InterfaceFloatingLabelEditPart.VISUAL_ID));

+		Node interface_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(InterfaceFloatingLabelEditPart.VISUAL_ID));

 		interface_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location interface_FloatingNameLabel_Location = (Location) interface_FloatingNameLabel.getLayoutConstraint();

 		interface_FloatingNameLabel_Location.setX(0);

@@ -881,21 +967,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createPrimitiveType_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createPrimitiveType_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(PrimitiveTypeEditPart.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, "PrimitiveType");

-		Node primitiveType_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID));

-		Node primitiveType_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeFloatingLabelEditPart.VISUAL_ID));

+		Node primitiveType_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID));

+		Node primitiveType_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(PrimitiveTypeFloatingLabelEditPart.VISUAL_ID));

 		primitiveType_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location primitiveType_FloatingNameLabel_Location = (Location) primitiveType_FloatingNameLabel.getLayoutConstraint();

+		Location primitiveType_FloatingNameLabel_Location = (Location) primitiveType_FloatingNameLabel

+				.getLayoutConstraint();

 		primitiveType_FloatingNameLabel_Location.setX(0);

 		primitiveType_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -904,24 +994,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createEnumeration_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createEnumeration_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(EnumerationEditPart.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, "Enumeration");

 		Node enumeration_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID));

-		Node enumeration_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(EnumerationFloatingLabelEditPart.VISUAL_ID));

+		Node enumeration_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(EnumerationFloatingLabelEditPart.VISUAL_ID));

 		enumeration_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location enumeration_FloatingNameLabel_Location = (Location) enumeration_FloatingNameLabel.getLayoutConstraint();

+		Location enumeration_FloatingNameLabel_Location = (Location) enumeration_FloatingNameLabel

+				.getLayoutConstraint();

 		enumeration_FloatingNameLabel_Location.setX(0);

 		enumeration_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID), true, true, true, true);

+		createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID),

+				true, true, true, true);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Enumeration");

 		return node;

 	}

@@ -929,25 +1023,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDataType_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDataType_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(DataTypeEditPart.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, "DataType");

 		Node dataType_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID));

-		Node dataType_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(DataTypeFloatingLabelEditPart.VISUAL_ID));

+		Node dataType_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DataTypeFloatingLabelEditPart.VISUAL_ID));

 		dataType_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location dataType_FloatingNameLabel_Location = (Location) dataType_FloatingNameLabel.getLayoutConstraint();

 		dataType_FloatingNameLabel_Location.setX(0);

 		dataType_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID), true, true, true, true);

+		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID), true, true,

+				true, true);

+		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID), true, true,

+				true, true);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "DataType");

 		return node;

 	}

@@ -955,19 +1053,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createActor_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createActor_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(ActorEditPart.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, "Actor");

 		Node actor_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ActorNameEditPart.VISUAL_ID));

-		Node actor_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(ActorFloatingLabelEditPart.VISUAL_ID));

+		Node actor_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ActorFloatingLabelEditPart.VISUAL_ID));

 		actor_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location actor_FloatingNameLabel_Location = (Location) actor_FloatingNameLabel.getLayoutConstraint();

 		actor_FloatingNameLabel_Location.setX(0);

@@ -978,21 +1078,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @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(0);

 		deploymentSpecification_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1001,19 +1105,21 @@ 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(0);

@@ -1024,21 +1130,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createInformationItem_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInformationItem_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(InformationItemEditPart.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, "InformationItem");

-		Node informationItem_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID));

-		Node informationItem_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(InformationItemFloatingLabelEditPart.VISUAL_ID));

+		Node informationItem_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID));

+		Node informationItem_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(InformationItemFloatingLabelEditPart.VISUAL_ID));

 		informationItem_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location informationItem_FloatingNameLabel_Location = (Location) informationItem_FloatingNameLabel.getLayoutConstraint();

+		Location informationItem_FloatingNameLabel_Location = (Location) informationItem_FloatingNameLabel

+				.getLayoutConstraint();

 		informationItem_FloatingNameLabel_Location.setX(0);

 		informationItem_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1047,19 +1157,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createSignal_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createSignal_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(SignalEditPart.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, "Signal");

 		Node signal_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPart.VISUAL_ID));

-		Node signal_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(SignalFloatingLabelEditPart.VISUAL_ID));

+		Node signal_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(SignalFloatingLabelEditPart.VISUAL_ID));

 		signal_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location signal_FloatingNameLabel_Location = (Location) signal_FloatingNameLabel.getLayoutConstraint();

 		signal_FloatingNameLabel_Location.setX(0);

@@ -1070,19 +1182,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createUseCase_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createUseCase_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(UseCaseEditPart.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, "UseCase");

 		Node useCase_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(UseCaseNameEditPart.VISUAL_ID));

-		Node useCase_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(UseCaseFloatingLabelEditPart.VISUAL_ID));

+		Node useCase_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(UseCaseFloatingLabelEditPart.VISUAL_ID));

 		useCase_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location useCase_FloatingNameLabel_Location = (Location) useCase_FloatingNameLabel.getLayoutConstraint();

 		useCase_FloatingNameLabel_Location.setX(0);

@@ -1093,21 +1207,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createSignalEvent_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createSignalEvent_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(SignalEventEditPart.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, "SignalEvent");

 		Node signalEvent_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(SignalEventNameEditPart.VISUAL_ID));

-		Node signalEvent_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(SignalEventFloatingLabelEditPart.VISUAL_ID));

+		Node signalEvent_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(SignalEventFloatingLabelEditPart.VISUAL_ID));

 		signalEvent_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location signalEvent_FloatingNameLabel_Location = (Location) signalEvent_FloatingNameLabel.getLayoutConstraint();

+		Location signalEvent_FloatingNameLabel_Location = (Location) signalEvent_FloatingNameLabel

+				.getLayoutConstraint();

 		signalEvent_FloatingNameLabel_Location.setX(0);

 		signalEvent_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1116,19 +1233,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createCallEvent_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createCallEvent_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(CallEventEditPart.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, "CallEvent");

 		Node callEvent_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(CallEventNameEditPart.VISUAL_ID));

-		Node callEvent_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(CallEventFloatingLabelEditPart.VISUAL_ID));

+		Node callEvent_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(CallEventFloatingLabelEditPart.VISUAL_ID));

 		callEvent_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location callEvent_FloatingNameLabel_Location = (Location) callEvent_FloatingNameLabel.getLayoutConstraint();

 		callEvent_FloatingNameLabel_Location.setX(0);

@@ -1139,21 +1258,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createAnyReceiveEvent_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createAnyReceiveEvent_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(AnyReceiveEventEditPart.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, "AnyReceiveEvent");

-		Node anyReceiveEvent_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(AnyReceiveEventNameEditPart.VISUAL_ID));

-		Node anyReceiveEvent_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(AnyReceiveEventFloatingLabelEditPart.VISUAL_ID));

+		Node anyReceiveEvent_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(AnyReceiveEventNameEditPart.VISUAL_ID));

+		Node anyReceiveEvent_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(AnyReceiveEventFloatingLabelEditPart.VISUAL_ID));

 		anyReceiveEvent_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location anyReceiveEvent_FloatingNameLabel_Location = (Location) anyReceiveEvent_FloatingNameLabel.getLayoutConstraint();

+		Location anyReceiveEvent_FloatingNameLabel_Location = (Location) anyReceiveEvent_FloatingNameLabel

+				.getLayoutConstraint();

 		anyReceiveEvent_FloatingNameLabel_Location.setX(0);

 		anyReceiveEvent_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1162,21 +1285,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createChangeEvent_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createChangeEvent_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(ChangeEventEditPart.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, "ChangeEvent");

 		Node changeEvent_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ChangeEventNameEditPart.VISUAL_ID));

-		Node changeEvent_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(ChangeEventFloatingLabelEditPart.VISUAL_ID));

+		Node changeEvent_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ChangeEventFloatingLabelEditPart.VISUAL_ID));

 		changeEvent_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location changeEvent_FloatingNameLabel_Location = (Location) changeEvent_FloatingNameLabel.getLayoutConstraint();

+		Location changeEvent_FloatingNameLabel_Location = (Location) changeEvent_FloatingNameLabel

+				.getLayoutConstraint();

 		changeEvent_FloatingNameLabel_Location.setX(0);

 		changeEvent_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1185,19 +1311,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createTimeEvent_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createTimeEvent_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(TimeEventEditPart.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, "TimeEvent");

 		Node timeEvent_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(TimeEventNameEditPart.VISUAL_ID));

-		Node timeEvent_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(TimeEventFloatingLabelEditPart.VISUAL_ID));

+		Node timeEvent_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(TimeEventFloatingLabelEditPart.VISUAL_ID));

 		timeEvent_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location timeEvent_FloatingNameLabel_Location = (Location) timeEvent_FloatingNameLabel.getLayoutConstraint();

 		timeEvent_FloatingNameLabel_Location.setX(0);

@@ -1208,25 +1336,30 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDurationObservation_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDurationObservation_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(DurationObservationEditPart.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, "DurationObservation");

-		Node durationObservation_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));

+		Node durationObservation_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));

 		durationObservation_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location durationObservation_NameLabel_Location = (Location) durationObservation_NameLabel.getLayoutConstraint();

+		Location durationObservation_NameLabel_Location = (Location) durationObservation_NameLabel

+				.getLayoutConstraint();

 		durationObservation_NameLabel_Location.setX(25);

 		durationObservation_NameLabel_Location.setY(3);

-		Node durationObservation_StereotypeLabel = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationStereotypeLabelEditPart.VISUAL_ID));

+		Node durationObservation_StereotypeLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DurationObservationStereotypeLabelEditPart.VISUAL_ID));

 		durationObservation_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location durationObservation_StereotypeLabel_Location = (Location) durationObservation_StereotypeLabel.getLayoutConstraint();

+		Location durationObservation_StereotypeLabel_Location = (Location) durationObservation_StereotypeLabel

+				.getLayoutConstraint();

 		durationObservation_StereotypeLabel_Location.setX(25);

 		durationObservation_StereotypeLabel_Location.setY(-10);

 		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(node, prefStore, "DurationObservation");

@@ -1236,25 +1369,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createTimeObservation_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createTimeObservation_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(TimeObservationEditPart.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, "TimeObservation");

-		Node timeObservation_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));

+		Node timeObservation_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));

 		timeObservation_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location timeObservation_NameLabel_Location = (Location) timeObservation_NameLabel.getLayoutConstraint();

 		timeObservation_NameLabel_Location.setX(25);

 		timeObservation_NameLabel_Location.setY(3);

-		Node timeObservation_StereotypeLabel = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationStereotypeLabelEditPart.VISUAL_ID));

+		Node timeObservation_StereotypeLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(TimeObservationStereotypeLabelEditPart.VISUAL_ID));

 		timeObservation_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location timeObservation_StereotypeLabel_Location = (Location) timeObservation_StereotypeLabel.getLayoutConstraint();

+		Location timeObservation_StereotypeLabel_Location = (Location) timeObservation_StereotypeLabel

+				.getLayoutConstraint();

 		timeObservation_StereotypeLabel_Location.setX(25);

 		timeObservation_StereotypeLabel_Location.setY(-10);

 		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(node, prefStore, "TimeObservation");

@@ -1264,21 +1401,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createLiteralBoolean_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createLiteralBoolean_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(LiteralBooleanEditPart.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, "LiteralBoolean");

-		Node literalBoolean_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(LiteralBooleanNameEditPart.VISUAL_ID));

-		Node literalBoolean_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(LiteralBooleanFloatingLabelEditPart.VISUAL_ID));

+		Node literalBoolean_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(LiteralBooleanNameEditPart.VISUAL_ID));

+		Node literalBoolean_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(LiteralBooleanFloatingLabelEditPart.VISUAL_ID));

 		literalBoolean_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location literalBoolean_FloatingNameLabel_Location = (Location) literalBoolean_FloatingNameLabel.getLayoutConstraint();

+		Location literalBoolean_FloatingNameLabel_Location = (Location) literalBoolean_FloatingNameLabel

+				.getLayoutConstraint();

 		literalBoolean_FloatingNameLabel_Location.setX(0);

 		literalBoolean_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1287,21 +1428,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createLiteralInteger_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createLiteralInteger_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(LiteralIntegerEditPart.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, "LiteralInteger");

-		Node literalInteger_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(LiteralIntegerNameEditPart.VISUAL_ID));

-		Node literalInteger_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(LiteralIntegerFloatingLabelEditPart.VISUAL_ID));

+		Node literalInteger_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(LiteralIntegerNameEditPart.VISUAL_ID));

+		Node literalInteger_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(LiteralIntegerFloatingLabelEditPart.VISUAL_ID));

 		literalInteger_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location literalInteger_FloatingNameLabel_Location = (Location) literalInteger_FloatingNameLabel.getLayoutConstraint();

+		Location literalInteger_FloatingNameLabel_Location = (Location) literalInteger_FloatingNameLabel

+				.getLayoutConstraint();

 		literalInteger_FloatingNameLabel_Location.setX(0);

 		literalInteger_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1310,21 +1455,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createLiteralNull_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createLiteralNull_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(LiteralNullEditPart.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, "LiteralNull");

 		Node literalNull_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(LiteralNullNameEditPart.VISUAL_ID));

-		Node literalNull_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(LiteralNullFloatingLabelEditPart.VISUAL_ID));

+		Node literalNull_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(LiteralNullFloatingLabelEditPart.VISUAL_ID));

 		literalNull_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location literalNull_FloatingNameLabel_Location = (Location) literalNull_FloatingNameLabel.getLayoutConstraint();

+		Location literalNull_FloatingNameLabel_Location = (Location) literalNull_FloatingNameLabel

+				.getLayoutConstraint();

 		literalNull_FloatingNameLabel_Location.setX(0);

 		literalNull_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1333,21 +1481,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createLiteralString_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createLiteralString_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(LiteralStringEditPart.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, "LiteralString");

-		Node literalString_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(LiteralStringNameEditPart.VISUAL_ID));

-		Node literalString_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(LiteralStringFloatingLabelEditPart.VISUAL_ID));

+		Node literalString_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(LiteralStringNameEditPart.VISUAL_ID));

+		Node literalString_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(LiteralStringFloatingLabelEditPart.VISUAL_ID));

 		literalString_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location literalString_FloatingNameLabel_Location = (Location) literalString_FloatingNameLabel.getLayoutConstraint();

+		Location literalString_FloatingNameLabel_Location = (Location) literalString_FloatingNameLabel

+				.getLayoutConstraint();

 		literalString_FloatingNameLabel_Location.setX(0);

 		literalString_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1356,21 +1508,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createLiteralUnlimitedNatural_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createLiteralUnlimitedNatural_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(LiteralUnlimitedNaturalEditPart.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, "LiteralUnlimitedNatural");

-		Node literalUnlimitedNatural_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));

-		Node literalUnlimitedNatural_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalFloatingLabelEditPart.VISUAL_ID));

+		Node literalUnlimitedNatural_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));

+		Node literalUnlimitedNatural_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalFloatingLabelEditPart.VISUAL_ID));

 		literalUnlimitedNatural_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location literalUnlimitedNatural_FloatingNameLabel_Location = (Location) literalUnlimitedNatural_FloatingNameLabel.getLayoutConstraint();

+		Location literalUnlimitedNatural_FloatingNameLabel_Location = (Location) literalUnlimitedNatural_FloatingNameLabel

+				.getLayoutConstraint();

 		literalUnlimitedNatural_FloatingNameLabel_Location.setX(0);

 		literalUnlimitedNatural_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1379,21 +1535,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createStringExpression_PackagedElementShape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createStringExpression_PackagedElementShape(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(StringExpressionEditPart.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, "StringExpression");

-		Node stringExpression_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(StringExpressionNameEditPart.VISUAL_ID));

-		Node stringExpression_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(StringExpressionFloatingLabelEditPart.VISUAL_ID));

+		Node stringExpression_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(StringExpressionNameEditPart.VISUAL_ID));

+		Node stringExpression_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(StringExpressionFloatingLabelEditPart.VISUAL_ID));

 		stringExpression_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location stringExpression_FloatingNameLabel_Location = (Location) stringExpression_FloatingNameLabel.getLayoutConstraint();

+		Location stringExpression_FloatingNameLabel_Location = (Location) stringExpression_FloatingNameLabel

+				.getLayoutConstraint();

 		stringExpression_FloatingNameLabel_Location.setX(0);

 		stringExpression_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1402,21 +1562,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createOpaqueExpression_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createOpaqueExpression_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(OpaqueExpressionEditPart.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, "OpaqueExpression");

-		Node opaqueExpression_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(OpaqueExpressionNameEditPart.VISUAL_ID));

-		Node opaqueExpression_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(OpaqueExpressionFloatingLabelEditPart.VISUAL_ID));

+		Node opaqueExpression_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(OpaqueExpressionNameEditPart.VISUAL_ID));

+		Node opaqueExpression_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(OpaqueExpressionFloatingLabelEditPart.VISUAL_ID));

 		opaqueExpression_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location opaqueExpression_FloatingNameLabel_Location = (Location) opaqueExpression_FloatingNameLabel.getLayoutConstraint();

+		Location opaqueExpression_FloatingNameLabel_Location = (Location) opaqueExpression_FloatingNameLabel

+				.getLayoutConstraint();

 		opaqueExpression_FloatingNameLabel_Location.setX(0);

 		opaqueExpression_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1425,21 +1589,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createTimeExpression_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createTimeExpression_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(TimeExpressionEditPart.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, "TimeExpression");

-		Node timeExpression_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(TimeExpressionNameEditPart.VISUAL_ID));

-		Node timeExpression_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(TimeExpressionFloatingLabelEditPart.VISUAL_ID));

+		Node timeExpression_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(TimeExpressionNameEditPart.VISUAL_ID));

+		Node timeExpression_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(TimeExpressionFloatingLabelEditPart.VISUAL_ID));

 		timeExpression_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location timeExpression_FloatingNameLabel_Location = (Location) timeExpression_FloatingNameLabel.getLayoutConstraint();

+		Location timeExpression_FloatingNameLabel_Location = (Location) timeExpression_FloatingNameLabel

+				.getLayoutConstraint();

 		timeExpression_FloatingNameLabel_Location.setX(0);

 		timeExpression_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1448,19 +1616,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createExpression_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createExpression_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(ExpressionEditPart.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, "Expression");

 		Node expression_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ExpressionNameEditPart.VISUAL_ID));

-		Node expression_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(ExpressionFloatingLabelEditPart.VISUAL_ID));

+		Node expression_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ExpressionFloatingLabelEditPart.VISUAL_ID));

 		expression_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location expression_FloatingNameLabel_Location = (Location) expression_FloatingNameLabel.getLayoutConstraint();

 		expression_FloatingNameLabel_Location.setX(0);

@@ -1471,19 +1641,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDuration_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDuration_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(DurationEditPart.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, "Duration");

 		Node duration_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(DurationNameEditPart.VISUAL_ID));

-		Node duration_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(DurationFloatingLabelEditPart.VISUAL_ID));

+		Node duration_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DurationFloatingLabelEditPart.VISUAL_ID));

 		duration_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location duration_FloatingNameLabel_Location = (Location) duration_FloatingNameLabel.getLayoutConstraint();

 		duration_FloatingNameLabel_Location.setX(0);

@@ -1494,21 +1666,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createTimeInterval_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createTimeInterval_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(TimeIntervalEditPart.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, "TimeInterval");

-		Node timeInterval_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(TimeIntervalNameEditPart.VISUAL_ID));

-		Node timeInterval_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(TimeIntervalFloatingLabelEditPart.VISUAL_ID));

+		Node timeInterval_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(TimeIntervalNameEditPart.VISUAL_ID));

+		Node timeInterval_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(TimeIntervalFloatingLabelEditPart.VISUAL_ID));

 		timeInterval_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location timeInterval_FloatingNameLabel_Location = (Location) timeInterval_FloatingNameLabel.getLayoutConstraint();

+		Location timeInterval_FloatingNameLabel_Location = (Location) timeInterval_FloatingNameLabel

+				.getLayoutConstraint();

 		timeInterval_FloatingNameLabel_Location.setX(0);

 		timeInterval_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1517,21 +1693,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDurationInterval_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDurationInterval_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(DurationIntervalEditPart.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, "DurationInterval");

-		Node durationInterval_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(DurationIntervalNameEditPart.VISUAL_ID));

-		Node durationInterval_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(DurationIntervalFloatingLabelEditPart.VISUAL_ID));

+		Node durationInterval_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DurationIntervalNameEditPart.VISUAL_ID));

+		Node durationInterval_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DurationIntervalFloatingLabelEditPart.VISUAL_ID));

 		durationInterval_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location durationInterval_FloatingNameLabel_Location = (Location) durationInterval_FloatingNameLabel.getLayoutConstraint();

+		Location durationInterval_FloatingNameLabel_Location = (Location) durationInterval_FloatingNameLabel

+				.getLayoutConstraint();

 		durationInterval_FloatingNameLabel_Location.setX(0);

 		durationInterval_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1540,19 +1720,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createInterval_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInterval_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(IntervalEditPart.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, "Interval");

 		Node interval_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(IntervalNameEditPart.VISUAL_ID));

-		Node interval_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(IntervalFloatingLabelEditPart.VISUAL_ID));

+		Node interval_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(IntervalFloatingLabelEditPart.VISUAL_ID));

 		interval_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location interval_FloatingNameLabel_Location = (Location) interval_FloatingNameLabel.getLayoutConstraint();

 		interval_FloatingNameLabel_Location.setX(0);

@@ -1563,21 +1745,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createInstanceValue_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInstanceValue_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(InstanceValueEditPart.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, "InstanceValue");

-		Node instanceValue_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(InstanceValueNameEditPart.VISUAL_ID));

-		Node instanceValue_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(InstanceValueFloatingLabelEditPart.VISUAL_ID));

+		Node instanceValue_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(InstanceValueNameEditPart.VISUAL_ID));

+		Node instanceValue_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(InstanceValueFloatingLabelEditPart.VISUAL_ID));

 		instanceValue_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location instanceValue_FloatingNameLabel_Location = (Location) instanceValue_FloatingNameLabel.getLayoutConstraint();

+		Location instanceValue_FloatingNameLabel_Location = (Location) instanceValue_FloatingNameLabel

+				.getLayoutConstraint();

 		instanceValue_FloatingNameLabel_Location.setX(0);

 		instanceValue_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1586,14 +1772,15 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @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");

@@ -1604,114 +1791,131 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDurationConstraint_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDurationConstraint_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(DurationConstraintEditPart.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, "DurationConstraint");

-		Node durationConstraint_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintNameEditPart.VISUAL_ID));

-		Node durationConstraint_BodyLabel = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintSpecificationEditPart.VISUAL_ID));

+		Node durationConstraint_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DurationConstraintNameEditPart.VISUAL_ID));

+		Node durationConstraint_BodyLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(DurationConstraintSpecificationEditPart.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createTimeConstraint_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createTimeConstraint_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(TimeConstraintEditPart.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, "TimeConstraint");

-		Node timeConstraint_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintNameEditPart.VISUAL_ID));

-		Node timeConstraint_BodyLabel = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintSpecificationEditPart.VISUAL_ID));

+		Node timeConstraint_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(TimeConstraintNameEditPart.VISUAL_ID));

+		Node timeConstraint_BodyLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(TimeConstraintSpecificationEditPart.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createIntervalConstraint_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createIntervalConstraint_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(IntervalConstraintEditPart.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, "IntervalConstraint");

-		Node intervalConstraint_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintNameEditPart.VISUAL_ID));

-		Node intervalConstraint_BodyLabel = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintSpecificationEditPart.VISUAL_ID));

+		Node intervalConstraint_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(IntervalConstraintNameEditPart.VISUAL_ID));

+		Node intervalConstraint_BodyLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(IntervalConstraintSpecificationEditPart.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createInteractionConstraint_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInteractionConstraint_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(InteractionConstraintEditPart.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, "InteractionConstraint");

-		Node interactionConstraint_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintNameEditPart.VISUAL_ID));

-		Node interactionConstraint_BodyLabel = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintSpecificationEditPart.VISUAL_ID));

+		Node interactionConstraint_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(InteractionConstraintNameEditPart.VISUAL_ID));

+		Node interactionConstraint_BodyLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(InteractionConstraintSpecificationEditPart.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @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 createPort_BehaviorShape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createPort_BehaviorShape(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(BehaviorPortEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Port");

-		Node port_BehaviorFloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(BehaviorPortFloatingLabelEditPart.VISUAL_ID));

+		Node port_BehaviorFloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(BehaviorPortFloatingLabelEditPart.VISUAL_ID));

 		port_BehaviorFloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location port_BehaviorFloatingNameLabel_Location = (Location) port_BehaviorFloatingNameLabel.getLayoutConstraint();

+		Location port_BehaviorFloatingNameLabel_Location = (Location) port_BehaviorFloatingNameLabel

+				.getLayoutConstraint();

 		port_BehaviorFloatingNameLabel_Location.setX(0);

 		port_BehaviorFloatingNameLabel_Location.setY(5);

 		return node;

@@ -1720,13 +1924,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createPort_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createPort_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(PortEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Port");

@@ -1735,7 +1940,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location port_NameLabel_Location = (Location) port_NameLabel.getLayoutConstraint();

 		port_NameLabel_Location.setX(25);

 		port_NameLabel_Location.setY(3);

-		Node port_StereotypeLabel = createLabel(node, UMLVisualIDRegistry.getType(PortAppliedStereotypeEditPart.VISUAL_ID));

+		Node port_StereotypeLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(PortAppliedStereotypeEditPart.VISUAL_ID));

 		port_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location port_StereotypeLabel_Location = (Location) port_StereotypeLabel.getLayoutConstraint();

 		port_StereotypeLabel_Location.setX(25);

@@ -1747,13 +1953,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createParameter_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createParameter_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(ParameterEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Parameter");

@@ -1762,7 +1969,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location parameter_NameLabel_Location = (Location) parameter_NameLabel.getLayoutConstraint();

 		parameter_NameLabel_Location.setX(25);

 		parameter_NameLabel_Location.setY(3);

-		Node parameter_StereotypeLabel = createLabel(node, UMLVisualIDRegistry.getType(ParameterAppliedStereotypeEditPart.VISUAL_ID));

+		Node parameter_StereotypeLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(ParameterAppliedStereotypeEditPart.VISUAL_ID));

 		parameter_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location parameter_StereotypeLabel_Location = (Location) parameter_StereotypeLabel.getLayoutConstraint();

 		parameter_StereotypeLabel_Location.setX(25);

@@ -1774,23 +1982,26 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createProperty_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createProperty_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(PropertyPartEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");

 		Node property_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));

-		Node property_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(PropertyPartFloatingLabelEditPartCN.VISUAL_ID));

+		Node property_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(PropertyPartFloatingLabelEditPartCN.VISUAL_ID));

 		property_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location property_FloatingNameLabel_Location = (Location) property_FloatingNameLabel.getLayoutConstraint();

 		property_FloatingNameLabel_Location.setX(0);

 		property_FloatingNameLabel_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(PropertyPartCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(PropertyPartCompartmentEditPartCN.VISUAL_ID), true, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Property");

 		return node;

 	}

@@ -1798,20 +2009,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createConnectableElement_CollaborationRoleShape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createConnectableElement_CollaborationRoleShape(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		node.setType(UMLVisualIDRegistry.getType(CollaborationRoleEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CollaborationRole");

-		Node connectableElement_CollaborationRoleNameLabel = createLabel(node, UMLVisualIDRegistry.getType(CollaborationRoleNameEditPartCN.VISUAL_ID));

-		Node connectableElement_CollaborationRoleFloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(CollaborationRoleFloatingLabelEditPartCN.VISUAL_ID));

-		connectableElement_CollaborationRoleFloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location connectableElement_CollaborationRoleFloatingNameLabel_Location = (Location) connectableElement_CollaborationRoleFloatingNameLabel.getLayoutConstraint();

+		Node connectableElement_CollaborationRoleNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(CollaborationRoleNameEditPartCN.VISUAL_ID));

+		Node connectableElement_CollaborationRoleFloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(CollaborationRoleFloatingLabelEditPartCN.VISUAL_ID));

+		connectableElement_CollaborationRoleFloatingNameLabel

+				.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location connectableElement_CollaborationRoleFloatingNameLabel_Location = (Location) connectableElement_CollaborationRoleFloatingNameLabel

+				.getLayoutConstraint();

 		connectableElement_CollaborationRoleFloatingNameLabel_Location.setX(0);

 		connectableElement_CollaborationRoleFloatingNameLabel_Location.setY(5);

 		return node;

@@ -1820,20 +2036,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createCollaborationUse_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createCollaborationUse_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(CollaborationUseEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CollaborationUse");

-		Node collaborationUse_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(CollaborationUseNameEditPart.VISUAL_ID));

-		Node collaborationUse_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(CollaborationUseFloatingLabelEditPartCN.VISUAL_ID));

+		Node collaborationUse_NameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(CollaborationUseNameEditPart.VISUAL_ID));

+		Node collaborationUse_FloatingNameLabel = createLabel(node,

+				UMLVisualIDRegistry.getType(CollaborationUseFloatingLabelEditPartCN.VISUAL_ID));

 		collaborationUse_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location collaborationUse_FloatingNameLabel_Location = (Location) collaborationUse_FloatingNameLabel.getLayoutConstraint();

+		Location collaborationUse_FloatingNameLabel_Location = (Location) collaborationUse_FloatingNameLabel

+				.getLayoutConstraint();

 		collaborationUse_FloatingNameLabel_Location.setX(0);

 		collaborationUse_FloatingNameLabel_Location.setY(5);

 		return node;

@@ -1842,23 +2062,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createActivity_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createActivity_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(ActivityCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Activity");

-		Node activity_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeNameEditPartCN.VISUAL_ID));

-		Node activity_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeFloatingLabelEditPartCN.VISUAL_ID));

+		Node activity_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ActivityCompositeNameEditPartCN.VISUAL_ID));

+		Node activity_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ActivityCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		activity_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location activity_FloatingNameLabel_CN_Location = (Location) activity_FloatingNameLabel_CN.getLayoutConstraint();

+		Location activity_FloatingNameLabel_CN_Location = (Location) activity_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		activity_FloatingNameLabel_CN_Location.setX(0);

 		activity_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ActivityCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ActivityCompositeCompartmentEditPartCN.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Activity");

 		return node;

 	}

@@ -1866,23 +2091,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createInteraction_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInteraction_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(InteractionCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interaction");

-		Node interaction_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeNameEditPartCN.VISUAL_ID));

-		Node interaction_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeFloatingLabelEditPartCN.VISUAL_ID));

+		Node interaction_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(InteractionCompositeNameEditPartCN.VISUAL_ID));

+		Node interaction_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(InteractionCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		interaction_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location interaction_FloatingNameLabel_CN_Location = (Location) interaction_FloatingNameLabel_CN.getLayoutConstraint();

+		Location interaction_FloatingNameLabel_CN_Location = (Location) interaction_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		interaction_FloatingNameLabel_CN_Location.setX(0);

 		interaction_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(InteractionCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(InteractionCompositeCompartmentEditPartCN.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interaction");

 		return node;

 	}

@@ -1890,23 +2120,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createProtocolStateMachine_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createProtocolStateMachine_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(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ProtocolStateMachine");

-		Node protocolStateMachine_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));

-		Node protocolStateMachine_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID));

+		Node protocolStateMachine_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));

+		Node protocolStateMachine_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		protocolStateMachine_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location protocolStateMachine_FloatingNameLabel_CN_Location = (Location) protocolStateMachine_FloatingNameLabel_CN.getLayoutConstraint();

+		Location protocolStateMachine_FloatingNameLabel_CN_Location = (Location) protocolStateMachine_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		protocolStateMachine_FloatingNameLabel_CN_Location.setX(0);

 		protocolStateMachine_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node,

+				UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID), true, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ProtocolStateMachine");

 		return node;

 	}

@@ -1914,23 +2150,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createStateMachine_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createStateMachine_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(StateMachineCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "StateMachine");

-		Node stateMachine_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPartCN.VISUAL_ID));

-		Node stateMachine_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID));

+		Node stateMachine_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPartCN.VISUAL_ID));

+		Node stateMachine_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(StateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		stateMachine_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location stateMachine_FloatingNameLabel_CN_Location = (Location) stateMachine_FloatingNameLabel_CN.getLayoutConstraint();

+		Location stateMachine_FloatingNameLabel_CN_Location = (Location) stateMachine_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		stateMachine_FloatingNameLabel_CN_Location.setX(0);

 		stateMachine_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(StateMachineCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(StateMachineCompositeCompartmentEditPartCN.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "StateMachine");

 		return node;

 	}

@@ -1938,23 +2179,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createFunctionBehavior_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createFunctionBehavior_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(FunctionBehaviorCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "FunctionBehavior");

-		Node functionBehavior_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));

-		Node functionBehavior_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID));

+		Node functionBehavior_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));

+		Node functionBehavior_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(FunctionBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		functionBehavior_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location functionBehavior_FloatingNameLabel_CN_Location = (Location) functionBehavior_FloatingNameLabel_CN.getLayoutConstraint();

+		Location functionBehavior_FloatingNameLabel_CN_Location = (Location) functionBehavior_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		functionBehavior_FloatingNameLabel_CN_Location.setX(0);

 		functionBehavior_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID),

+				true, true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "FunctionBehavior");

 		return node;

 	}

@@ -1962,23 +2208,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createOpaqueBehavior_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createOpaqueBehavior_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(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "OpaqueBehavior");

-		Node opaqueBehavior_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));

-		Node opaqueBehavior_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID));

+		Node opaqueBehavior_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));

+		Node opaqueBehavior_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		opaqueBehavior_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location opaqueBehavior_FloatingNameLabel_CN_Location = (Location) opaqueBehavior_FloatingNameLabel_CN.getLayoutConstraint();

+		Location opaqueBehavior_FloatingNameLabel_CN_Location = (Location) opaqueBehavior_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		opaqueBehavior_FloatingNameLabel_CN_Location.setX(0);

 		opaqueBehavior_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID),

+				true, true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "OpaqueBehavior");

 		return node;

 	}

@@ -1986,23 +2237,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createComponent_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createComponent_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(ComponentCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

-		Node component_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeNameEditPartCN.VISUAL_ID));

-		Node component_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeFloatingLabelEditPartCN.VISUAL_ID));

+		Node component_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ComponentCompositeNameEditPartCN.VISUAL_ID));

+		Node component_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ComponentCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		component_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location component_FloatingNameLabel_CN_Location = (Location) component_FloatingNameLabel_CN.getLayoutConstraint();

+		Location component_FloatingNameLabel_CN_Location = (Location) component_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		component_FloatingNameLabel_CN_Location.setX(0);

 		component_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPartCN.VISUAL_ID), true,

+				true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

 		return node;

 	}

@@ -2010,23 +2266,27 @@ 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(DeviceCompositeEditPartCN.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(DeviceCompositeNameEditPartCN.VISUAL_ID));

-		Node device_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(DeviceCompositeFloatingLabelEditPartCN.VISUAL_ID));

+		Node device_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(DeviceCompositeNameEditPartCN.VISUAL_ID));

+		Node device_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(DeviceCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		device_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location device_FloatingNameLabel_CN_Location = (Location) device_FloatingNameLabel_CN.getLayoutConstraint();

 		device_FloatingNameLabel_CN_Location.setX(0);

 		device_FloatingNameLabel_CN_Location.setY(5);

-		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;

 	}

@@ -2034,23 +2294,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @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(ExecutionEnvironmentCompositeEditPartCN.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(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));

-		Node executionEnvironment_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeFloatingLabelEditPartCN.VISUAL_ID));

+		Node executionEnvironment_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));

+		Node executionEnvironment_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		executionEnvironment_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location executionEnvironment_FloatingNameLabel_CN_Location = (Location) executionEnvironment_FloatingNameLabel_CN.getLayoutConstraint();

+		Location executionEnvironment_FloatingNameLabel_CN_Location = (Location) executionEnvironment_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		executionEnvironment_FloatingNameLabel_CN_Location.setX(0);

 		executionEnvironment_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node,

+				UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID), true, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ExecutionEnvironment");

 		return node;

 	}

@@ -2058,23 +2324,26 @@ 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(NodeCompositeEditPartCN.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(NodeCompositeNameEditPartCN.VISUAL_ID));

-		Node node_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(NodeCompositeFloatingLabelEditPartCN.VISUAL_ID));

+		Node node_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(NodeCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		node_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location node_FloatingNameLabel_CN_Location = (Location) node_FloatingNameLabel_CN.getLayoutConstraint();

 		node_FloatingNameLabel_CN_Location.setX(0);

 		node_FloatingNameLabel_CN_Location.setY(5);

-		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;

 	}

@@ -2082,23 +2351,27 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createClass_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createClass_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(ClassCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");

-		Node class_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeNameEditPartCN.VISUAL_ID));

-		Node class_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeFloatingLabelEditPartCN.VISUAL_ID));

+		Node class_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ClassCompositeNameEditPartCN.VISUAL_ID));

+		Node class_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ClassCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		class_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location class_FloatingNameLabel_CN_Location = (Location) class_FloatingNameLabel_CN.getLayoutConstraint();

 		class_FloatingNameLabel_CN_Location.setX(0);

 		class_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(ClassCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(ClassCompositeCompartmentEditPartCN.VISUAL_ID), true, true,

+				false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");

 		return node;

 	}

@@ -2106,23 +2379,28 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createCollaboration_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createCollaboration_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(CollaborationCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Collaboration");

-		Node collaboration_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPartCN.VISUAL_ID));

-		Node collaboration_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeFloatingLabelEditPartCN.VISUAL_ID));

+		Node collaboration_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPartCN.VISUAL_ID));

+		Node collaboration_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(CollaborationCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		collaboration_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location collaboration_FloatingNameLabel_CN_Location = (Location) collaboration_FloatingNameLabel_CN.getLayoutConstraint();

+		Location collaboration_FloatingNameLabel_CN_Location = (Location) collaboration_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		collaboration_FloatingNameLabel_CN_Location.setX(0);

 		collaboration_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(CollaborationCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		createCompartment(node, UMLVisualIDRegistry.getType(CollaborationCompositeCompartmentEditPartCN.VISUAL_ID),

+				true, true, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Collaboration");

 		return node;

 	}

@@ -2130,20 +2408,23 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createInterface_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInterface_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(InterfaceEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");

 		Node interface_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPartCN.VISUAL_ID));

-		Node interface_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InterfaceFloatingLabelEditPartCN.VISUAL_ID));

+		Node interface_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(InterfaceFloatingLabelEditPartCN.VISUAL_ID));

 		interface_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location interface_FloatingNameLabel_CN_Location = (Location) interface_FloatingNameLabel_CN.getLayoutConstraint();

+		Location interface_FloatingNameLabel_CN_Location = (Location) interface_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		interface_FloatingNameLabel_CN_Location.setX(0);

 		interface_FloatingNameLabel_CN_Location.setY(5);

 		return node;

@@ -2152,20 +2433,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createPrimitiveType_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createPrimitiveType_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(PrimitiveTypeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType");

-		Node primitiveType_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID));

-		Node primitiveType_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeFloatingLabelEditPartCN.VISUAL_ID));

+		Node primitiveType_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID));

+		Node primitiveType_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(PrimitiveTypeFloatingLabelEditPartCN.VISUAL_ID));

 		primitiveType_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location primitiveType_FloatingNameLabel_CN_Location = (Location) primitiveType_FloatingNameLabel_CN.getLayoutConstraint();

+		Location primitiveType_FloatingNameLabel_CN_Location = (Location) primitiveType_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		primitiveType_FloatingNameLabel_CN_Location.setX(0);

 		primitiveType_FloatingNameLabel_CN_Location.setY(5);

 		return node;

@@ -2174,23 +2459,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createEnumeration_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createEnumeration_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(EnumerationEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration");

-		Node enumeration_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID));

-		Node enumeration_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(EnumerationFloatingLabelEditPartCN.VISUAL_ID));

+		Node enumeration_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID));

+		Node enumeration_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(EnumerationFloatingLabelEditPartCN.VISUAL_ID));

 		enumeration_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location enumeration_FloatingNameLabel_CN_Location = (Location) enumeration_FloatingNameLabel_CN.getLayoutConstraint();

+		Location enumeration_FloatingNameLabel_CN_Location = (Location) enumeration_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		enumeration_FloatingNameLabel_CN_Location.setX(0);

 		enumeration_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

+		createCompartment(node,

+				UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID), true, true,

+				true, true);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Enumeration");

 		return node;

 	}

@@ -2198,24 +2489,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDataType_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDataType_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(DataTypeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType");

 		Node dataType_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID));

-		Node dataType_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(DataTypeFloatingLabelEditPartCN.VISUAL_ID));

+		Node dataType_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(DataTypeFloatingLabelEditPartCN.VISUAL_ID));

 		dataType_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location dataType_FloatingNameLabel_CN_Location = (Location) dataType_FloatingNameLabel_CN.getLayoutConstraint();

+		Location dataType_FloatingNameLabel_CN_Location = (Location) dataType_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		dataType_FloatingNameLabel_CN_Location.setX(0);

 		dataType_FloatingNameLabel_CN_Location.setY(5);

-		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

+		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID), true,

+				true, true, true);

+		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID), true,

+				true, true, true);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "DataType");

 		return node;

 	}

@@ -2223,18 +2519,20 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createActor_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createActor_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(ActorEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Actor");

 		Node actor_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ActorNameEditPartCN.VISUAL_ID));

-		Node actor_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ActorFloatingLabelEditPartCN.VISUAL_ID));

+		Node actor_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ActorFloatingLabelEditPartCN.VISUAL_ID));

 		actor_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location actor_FloatingNameLabel_CN_Location = (Location) actor_FloatingNameLabel_CN.getLayoutConstraint();

 		actor_FloatingNameLabel_CN_Location.setX(0);

@@ -2245,20 +2543,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(DeploymentSpecificationEditPartCN.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(DeploymentSpecificationNameEditPartCN.VISUAL_ID));

-		Node deploymentSpecification_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationFloatingLabelEditPartCN.VISUAL_ID));

+		Node deploymentSpecification_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPartCN.VISUAL_ID));

+		Node deploymentSpecification_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(DeploymentSpecificationFloatingLabelEditPartCN.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(0);

 		deploymentSpecification_FloatingNameLabel_CN_Location.setY(5);

 		return node;

@@ -2267,20 +2569,23 @@ 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(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_CN = createLabel(node, UMLVisualIDRegistry.getType(ArtifactNameEditPartCN.VISUAL_ID));

-		Node artifact_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ArtifactFloatingLabelEditPartCN.VISUAL_ID));

+		Node artifact_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(ArtifactFloatingLabelEditPartCN.VISUAL_ID));

 		artifact_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location artifact_FloatingNameLabel_CN_Location = (Location) artifact_FloatingNameLabel_CN.getLayoutConstraint();

+		Location artifact_FloatingNameLabel_CN_Location = (Location) artifact_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		artifact_FloatingNameLabel_CN_Location.setX(0);

 		artifact_FloatingNameLabel_CN_Location.setY(5);

 		return node;

@@ -2289,20 +2594,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createInformationItem_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInformationItem_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(InformationItemEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InformationItem");

-		Node informationItem_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID));

-		Node informationItem_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InformationItemFloatingLabelEditPartCN.VISUAL_ID));

+		Node informationItem_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID));

+		Node informationItem_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(InformationItemFloatingLabelEditPartCN.VISUAL_ID));

 		informationItem_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location informationItem_FloatingNameLabel_CN_Location = (Location) informationItem_FloatingNameLabel_CN.getLayoutConstraint();

+		Location informationItem_FloatingNameLabel_CN_Location = (Location) informationItem_FloatingNameLabel_CN

+				.getLayoutConstraint();

 		informationItem_FloatingNameLabel_CN_Location.setX(0);

 		informationItem_FloatingNameLabel_CN_Location.setY(5);

 		return node;

@@ -2311,18 +2620,20 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createSignal_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createSignal_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(SignalEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Signal");

 		Node signal_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPartCN.VISUAL_ID));

-		Node signal_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(SignalFloatingLabelEditPartCN.VISUAL_ID));

+		Node signal_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(SignalFloatingLabelEditPartCN.VISUAL_ID));

 		signal_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location signal_FloatingNameLabel_CN_Location = (Location) signal_FloatingNameLabel_CN.getLayoutConstraint();

 		signal_FloatingNameLabel_CN_Location.setX(0);

@@ -2333,18 +2644,20 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createUseCase_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createUseCase_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(UseCaseEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "UseCase");

 		Node useCase_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(UseCaseNameEditPartCN.VISUAL_ID));

-		Node useCase_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(UseCaseFloatingLabelEditPartCN.VISUAL_ID));

+		Node useCase_FloatingNameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(UseCaseFloatingLabelEditPartCN.VISUAL_ID));

 		useCase_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location useCase_FloatingNameLabel_CN_Location = (Location) useCase_FloatingNameLabel_CN.getLayoutConstraint();

 		useCase_FloatingNameLabel_CN_Location.setX(0);

@@ -2355,13 +2668,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @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");

@@ -2372,97 +2686,113 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createDurationConstraint_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createDurationConstraint_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(DurationConstraintEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DurationConstraint");

-		Node durationConstraint_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintNameEditPartCN.VISUAL_ID));

-		Node durationConstraint_BodyLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintSpecificationEditPartCN.VISUAL_ID));

+		Node durationConstraint_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(DurationConstraintNameEditPartCN.VISUAL_ID));

+		Node durationConstraint_BodyLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(DurationConstraintSpecificationEditPartCN.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createTimeConstraint_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createTimeConstraint_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(TimeConstraintEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeConstraint");

-		Node timeConstraint_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintNameEditPartCN.VISUAL_ID));

-		Node timeConstraint_BodyLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintSpecificationEditPartCN.VISUAL_ID));

+		Node timeConstraint_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(TimeConstraintNameEditPartCN.VISUAL_ID));

+		Node timeConstraint_BodyLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(TimeConstraintSpecificationEditPartCN.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createIntervalConstraint_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createIntervalConstraint_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(IntervalConstraintEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "IntervalConstraint");

-		Node intervalConstraint_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintNameEditPartCN.VISUAL_ID));

-		Node intervalConstraint_BodyLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintSpecificationEditPartCN.VISUAL_ID));

+		Node intervalConstraint_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(IntervalConstraintNameEditPartCN.VISUAL_ID));

+		Node intervalConstraint_BodyLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(IntervalConstraintSpecificationEditPartCN.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @generated

 	 */

-	public Node createInteractionConstraint_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createInteractionConstraint_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(InteractionConstraintEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

+		// initializeFromPreferences 

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InteractionConstraint");

-		Node interactionConstraint_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintNameEditPartCN.VISUAL_ID));

-		Node interactionConstraint_BodyLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintSpecificationEditPartCN.VISUAL_ID));

+		Node interactionConstraint_NameLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(InteractionConstraintNameEditPartCN.VISUAL_ID));

+		Node interactionConstraint_BodyLabel_CN = createLabel(node,

+				UMLVisualIDRegistry.getType(InteractionConstraintSpecificationEditPartCN.VISUAL_ID));

 		return node;

 	}

 

 	/**

 	 * @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 createProperty_AttributeLabel(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createProperty_AttributeLabel(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		node.setType(UMLVisualIDRegistry.getType(PropertyEditPartCLN.VISUAL_ID));

@@ -2477,7 +2807,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createOperation_OperationLabel(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createOperation_OperationLabel(EObject domainElement, View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		node.setType(UMLVisualIDRegistry.getType(OperationEditPartCLN.VISUAL_ID));

@@ -2492,7 +2823,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Node createEnumerationLiteral_LiteralLabel(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Node createEnumerationLiteral_LiteralLabel(EObject domainElement, View containerView, int index,

+			boolean persisted, PreferencesHint preferencesHint) {

 		Node node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		node.setType(UMLVisualIDRegistry.getType(EnumerationLiteralEditPartCLN.VISUAL_ID));

@@ -2507,7 +2839,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createPort_BehaviorEdge(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createPort_BehaviorEdge(View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

@@ -2522,10 +2855,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;

 	}

@@ -2533,7 +2866,8 @@ 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();

@@ -2548,10 +2882,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;

 	}

@@ -2559,7 +2893,8 @@ 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();

@@ -2575,10 +2910,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;

 	}

@@ -2586,7 +2921,8 @@ 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();

@@ -2602,10 +2938,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;

 	}

@@ -2613,7 +2949,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createComponentRealization_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createComponentRealization_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();

@@ -2629,18 +2966,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ComponentRealization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		Node componentRealization_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(ComponentRealizationNameEditPart.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 componentRealization_NameLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(ComponentRealizationNameEditPart.VISUAL_ID));

 		componentRealization_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location componentRealization_NameLabel_Location = (Location) componentRealization_NameLabel.getLayoutConstraint();

+		Location componentRealization_NameLabel_Location = (Location) componentRealization_NameLabel

+				.getLayoutConstraint();

 		componentRealization_NameLabel_Location.setX(0);

 		componentRealization_NameLabel_Location.setY(60);

-		Node componentRealization_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID));

+		Node componentRealization_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID));

 		componentRealization_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location componentRealization_StereotypeLabel_Location = (Location) componentRealization_StereotypeLabel.getLayoutConstraint();

+		Location componentRealization_StereotypeLabel_Location = (Location) componentRealization_StereotypeLabel

+				.getLayoutConstraint();

 		componentRealization_StereotypeLabel_Location.setX(0);

 		componentRealization_StereotypeLabel_Location.setY(30);

 

@@ -2651,7 +2992,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createInterfaceRealization_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createInterfaceRealization_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();

@@ -2667,18 +3009,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InterfaceRealization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		Node interfaceRealization_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationNameEditPart.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 interfaceRealization_NameLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(InterfaceRealizationNameEditPart.VISUAL_ID));

 		interfaceRealization_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location interfaceRealization_NameLabel_Location = (Location) interfaceRealization_NameLabel.getLayoutConstraint();

+		Location interfaceRealization_NameLabel_Location = (Location) interfaceRealization_NameLabel

+				.getLayoutConstraint();

 		interfaceRealization_NameLabel_Location.setX(0);

 		interfaceRealization_NameLabel_Location.setY(60);

-		Node interfaceRealization_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID));

+		Node interfaceRealization_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID));

 		interfaceRealization_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location interfaceRealization_StereotypeLabel_Location = (Location) interfaceRealization_StereotypeLabel.getLayoutConstraint();

+		Location interfaceRealization_StereotypeLabel_Location = (Location) interfaceRealization_StereotypeLabel

+				.getLayoutConstraint();

 		interfaceRealization_StereotypeLabel_Location.setX(0);

 		interfaceRealization_StereotypeLabel_Location.setY(30);

 

@@ -2689,7 +3035,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createSubstitution_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createSubstitution_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();

@@ -2705,16 +3052,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Substitution");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		Node substitution_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionNameEditPart.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 substitution_NameLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(SubstitutionNameEditPart.VISUAL_ID));

 		substitution_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location substitution_NameLabel_Location = (Location) substitution_NameLabel.getLayoutConstraint();

 		substitution_NameLabel_Location.setX(0);

 		substitution_NameLabel_Location.setY(60);

-		Node substitution_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionAppliedStereotypeEditPart.VISUAL_ID));

+		Node substitution_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(SubstitutionAppliedStereotypeEditPart.VISUAL_ID));

 		substitution_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location substitution_StereotypeLabel_Location = (Location) substitution_StereotypeLabel.getLayoutConstraint();

 		substitution_StereotypeLabel_Location.setX(0);

@@ -2727,7 +3076,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createRealization_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createRealization_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();

@@ -2743,16 +3093,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Realization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node realization_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(RealizationNameEditPart.VISUAL_ID));

 		realization_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location realization_NameLabel_Location = (Location) realization_NameLabel.getLayoutConstraint();

 		realization_NameLabel_Location.setX(0);

 		realization_NameLabel_Location.setY(60);

-		Node realization_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(RealizationAppliedStereotypeEditPart.VISUAL_ID));

+		Node realization_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(RealizationAppliedStereotypeEditPart.VISUAL_ID));

 		realization_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location realization_StereotypeLabel_Location = (Location) realization_StereotypeLabel.getLayoutConstraint();

 		realization_StereotypeLabel_Location.setX(0);

@@ -2765,7 +3116,8 @@ 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();

@@ -2781,18 +3133,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);

 

@@ -2803,7 +3158,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createAbstraction_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createAbstraction_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();

@@ -2819,16 +3175,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Abstraction");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node abstraction_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionNameEditPart.VISUAL_ID));

 		abstraction_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location abstraction_NameLabel_Location = (Location) abstraction_NameLabel.getLayoutConstraint();

 		abstraction_NameLabel_Location.setX(0);

 		abstraction_NameLabel_Location.setY(60);

-		Node abstraction_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionAppliedStereotypeEditPart.VISUAL_ID));

+		Node abstraction_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(AbstractionAppliedStereotypeEditPart.VISUAL_ID));

 		abstraction_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location abstraction_StereotypeLabel_Location = (Location) abstraction_StereotypeLabel.getLayoutConstraint();

 		abstraction_StereotypeLabel_Location.setX(0);

@@ -2841,7 +3198,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createUsage_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createUsage_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();

@@ -2857,16 +3215,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Usage");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node usage_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(UsageNameEditPart.VISUAL_ID));

 		usage_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location usage_NameLabel_Location = (Location) usage_NameLabel.getLayoutConstraint();

 		usage_NameLabel_Location.setX(0);

 		usage_NameLabel_Location.setY(60);

-		Node usage_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(UsageAppliedStereotypeEditPart.VISUAL_ID));

+		Node usage_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(UsageAppliedStereotypeEditPart.VISUAL_ID));

 		usage_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location usage_StereotypeLabel_Location = (Location) usage_StereotypeLabel.getLayoutConstraint();

 		usage_StereotypeLabel_Location.setX(0);

@@ -2879,7 +3238,8 @@ 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();

@@ -2895,16 +3255,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);

@@ -2917,7 +3278,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createDependency_RoleBindingEdge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createDependency_RoleBindingEdge(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();

@@ -2933,18 +3295,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "RoleBinding");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		Node dependency_RoleBindingNameLabel = createLabel(edge, UMLVisualIDRegistry.getType(RoleBindingRoleNameEditPart.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 dependency_RoleBindingNameLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(RoleBindingRoleNameEditPart.VISUAL_ID));

 		dependency_RoleBindingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location dependency_RoleBindingNameLabel_Location = (Location) dependency_RoleBindingNameLabel.getLayoutConstraint();

+		Location dependency_RoleBindingNameLabel_Location = (Location) dependency_RoleBindingNameLabel

+				.getLayoutConstraint();

 		dependency_RoleBindingNameLabel_Location.setX(0);

 		dependency_RoleBindingNameLabel_Location.setY(20);

-		Node dependency_RoleBindingStereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(RoleBindingAppliedStereotypeEditPart.VISUAL_ID));

+		Node dependency_RoleBindingStereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(RoleBindingAppliedStereotypeEditPart.VISUAL_ID));

 		dependency_RoleBindingStereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location dependency_RoleBindingStereotypeLabel_Location = (Location) dependency_RoleBindingStereotypeLabel.getLayoutConstraint();

+		Location dependency_RoleBindingStereotypeLabel_Location = (Location) dependency_RoleBindingStereotypeLabel

+				.getLayoutConstraint();

 		dependency_RoleBindingStereotypeLabel_Location.setX(0);

 		dependency_RoleBindingStereotypeLabel_Location.setY(60);

 

@@ -2955,7 +3321,8 @@ 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();

@@ -2971,16 +3338,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Dependency");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node 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(60);

-		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);

@@ -2993,7 +3361,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createConnector_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createConnector_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();

@@ -3009,11 +3378,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Connector");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		Node connector_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorAppliedStereotypeEditPart.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 connector_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(ConnectorAppliedStereotypeEditPart.VISUAL_ID));

 		connector_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location connector_StereotypeLabel_Location = (Location) connector_StereotypeLabel.getLayoutConstraint();

 		connector_StereotypeLabel_Location.setX(0);

@@ -3023,14 +3393,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location connector_NameLabel_Location = (Location) connector_NameLabel.getLayoutConstraint();

 		connector_NameLabel_Location.setX(0);

 		connector_NameLabel_Location.setY(-20);

-		Node connector_SourceMultiplicityLabel = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorMultiplicitySourceEditPart.VISUAL_ID));

+		Node connector_SourceMultiplicityLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(ConnectorMultiplicitySourceEditPart.VISUAL_ID));

 		connector_SourceMultiplicityLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location connector_SourceMultiplicityLabel_Location = (Location) connector_SourceMultiplicityLabel.getLayoutConstraint();

+		Location connector_SourceMultiplicityLabel_Location = (Location) connector_SourceMultiplicityLabel

+				.getLayoutConstraint();

 		connector_SourceMultiplicityLabel_Location.setX(0);

 		connector_SourceMultiplicityLabel_Location.setY(20);

-		Node connector_TargetMultiplicityLabel = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorMultiplicityTargetEditPart.VISUAL_ID));

+		Node connector_TargetMultiplicityLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(ConnectorMultiplicityTargetEditPart.VISUAL_ID));

 		connector_TargetMultiplicityLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location connector_TargetMultiplicityLabel_Location = (Location) connector_TargetMultiplicityLabel.getLayoutConstraint();

+		Location connector_TargetMultiplicityLabel_Location = (Location) connector_TargetMultiplicityLabel

+				.getLayoutConstraint();

 		connector_TargetMultiplicityLabel_Location.setX(0);

 		connector_TargetMultiplicityLabel_Location.setY(20);

 

@@ -3041,7 +3415,8 @@ 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();

@@ -3057,13 +3432,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);

 

@@ -3074,7 +3451,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createTimeObservation_EventEdge(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createTimeObservation_EventEdge(View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

@@ -3090,10 +3468,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "TimeObservationEvent");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 

 		return edge;

 	}

@@ -3101,7 +3479,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createDurationObservation_EventEdge(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createDurationObservation_EventEdge(View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

@@ -3117,10 +3496,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DurationObservationEvent");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 

 		return edge;

 	}

@@ -3128,7 +3507,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createRepresentation_Edge(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createRepresentation_Edge(View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

 		Connector edge = NotationFactory.eINSTANCE.createConnector();

 		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

 		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

@@ -3143,12 +3523,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

-		ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.colorToInteger(ColorConstants.black));

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		Node representation_KeywordLabel = createLabel(edge, UMLVisualIDRegistry.getType(RepresentationTagLabelEditPart.VISUAL_ID));

+		ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.colorToInteger(ColorConstants.black));

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

+		Node representation_KeywordLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(RepresentationTagLabelEditPart.VISUAL_ID));

 		representation_KeywordLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location representation_KeywordLabel_Location = (Location) representation_KeywordLabel.getLayoutConstraint();

 		representation_KeywordLabel_Location.setX(0);

@@ -3161,7 +3543,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	public Edge createInformationFlow_Edge(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+	public Edge createInformationFlow_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();

@@ -3177,21 +3560,26 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InformationFlow");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-		Node informationFlow_ConveyedLabel = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowConveyedLabelEditPart.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 informationFlow_ConveyedLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(InformationFlowConveyedLabelEditPart.VISUAL_ID));

 		informationFlow_ConveyedLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location informationFlow_ConveyedLabel_Location = (Location) informationFlow_ConveyedLabel.getLayoutConstraint();

+		Location informationFlow_ConveyedLabel_Location = (Location) informationFlow_ConveyedLabel

+				.getLayoutConstraint();

 		informationFlow_ConveyedLabel_Location.setX(0);

 		informationFlow_ConveyedLabel_Location.setY(30);

-		Node informationFlow_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowAppliedStereotypeEditPart.VISUAL_ID));

+		Node informationFlow_StereotypeLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(InformationFlowAppliedStereotypeEditPart.VISUAL_ID));

 		informationFlow_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location informationFlow_StereotypeLabel_Location = (Location) informationFlow_StereotypeLabel.getLayoutConstraint();

+		Location informationFlow_StereotypeLabel_Location = (Location) informationFlow_StereotypeLabel

+				.getLayoutConstraint();

 		informationFlow_StereotypeLabel_Location.setX(0);

 		informationFlow_StereotypeLabel_Location.setY(15);

-		Node informationFlow_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowNameEditPart.VISUAL_ID));

+		Node informationFlow_NameLabel = createLabel(edge,

+				UMLVisualIDRegistry.getType(InformationFlowNameEditPart.VISUAL_ID));

 		informationFlow_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location informationFlow_NameLabel_Location = (Location) informationFlow_NameLabel.getLayoutConstraint();

 		informationFlow_NameLabel_Location.setX(0);

@@ -3226,10 +3614,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());

@@ -3277,8 +3666,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @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) {

@@ -3297,38 +3688,38 @@ 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.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java
index cb7fa1545b3..8cc6d1b20a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java
@@ -26,7 +26,7 @@ public class UMLPropertySection extends DefaultPropertySection implements IPrope
 	 */

 	@Override

 	protected Object transformSelection(Object selected) {

-		selected = /* super. */transformSelectionToDomain(selected);

+		selected = /*super.*/transformSelectionToDomain(selected);

 		return selected;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractGraphicalCommandHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractGraphicalCommandHandler.java
index 5cb44dc5b25..bd57c037892 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractGraphicalCommandHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractGraphicalCommandHandler.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.uml.diagram.common.Activator;
  * The command is executed by the handler
  *
  * @deprecated Since February 2014 use org.eclipse.papyrus.infra.gmfdiag.menu.handlers.AbstractGraphicalCommandHandler
+ * FIXME: it's impossible to use the new class due to missing parameter field from AbstractParametricHandler 
  */
 @Deprecated
 public abstract class AbstractGraphicalCommandHandler extends AbstractParametricHandler {
@@ -75,8 +76,8 @@ public abstract class AbstractGraphicalCommandHandler extends AbstractParametric
 	 * @return null
 	 * @throws ExecutionException
 	 */
+	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
-
 		TransactionalEditingDomain editingDomain = getEditingDomain();
 		if (editingDomain != null) {
 			editingDomain.getCommandStack().execute(new GEFtoEMFCommandWrapper(getCommand()));
@@ -96,7 +97,7 @@ public abstract class AbstractGraphicalCommandHandler extends AbstractParametric
 				return;
 			}
 		} catch (ExecutionException e) {
-			e.printStackTrace();
+			Activator.log.error(e);
 		}
 
 		setBaseEnabled(false);
@@ -112,7 +113,7 @@ public abstract class AbstractGraphicalCommandHandler extends AbstractParametric
 				return true;
 			}
 		} catch (ExecutionException e) {
-			e.printStackTrace();
+			Activator.log.error(e);
 		}
 
 		return false;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractParametricHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractParametricHandler.java
index 6943656f461..ed9841830d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractParametricHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractParametricHandler.java
@@ -81,6 +81,7 @@ public abstract class AbstractParametricHandler extends AbstractHandler implemen
 	 * @throws CoreException

 	 */

 	@SuppressWarnings("rawtypes")

+	@Override

 	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {

 		if (data instanceof Hashtable && this.parameterID != null) {

 			this.parameter = (String) ((Hashtable) data).get(this.parameterID);

@@ -94,7 +95,7 @@ public abstract class AbstractParametricHandler extends AbstractHandler implemen
 	 * @return the currently selected {@link IGraphicalEditPart}

 	 */

 	protected List<IGraphicalEditPart> getSelectedElements() {

-		List<IGraphicalEditPart> editparts = new ArrayList<IGraphicalEditPart>();

+		List<IGraphicalEditPart> editparts = new ArrayList<>();

 

 

 		// Get current selection

@@ -155,7 +156,7 @@ public abstract class AbstractParametricHandler extends AbstractHandler implemen
 			diagramPart = (IDiagramWorkbenchPart) part;

 

 		} else if (part != null) {

-			diagramPart = (IDiagramWorkbenchPart) part.getAdapter(IDiagramWorkbenchPart.class);

+			diagramPart = part.getAdapter(IDiagramWorkbenchPart.class);

 		}

 

 		return diagramPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ShowHideLabelsHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ShowHideLabelsHandler.java
index d37344337a0..24d13af68d1 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ShowHideLabelsHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ShowHideLabelsHandler.java
@@ -20,8 +20,6 @@ import org.eclipse.papyrus.uml.diagram.menu.actions.ShowHideLabelsAction;
 /**

  * Handler for the {@link ShowHideLabelsAction}

  *

- *

- *

  */

 public class ShowHideLabelsHandler extends AbstractGraphicalCommandHandler {

 

@@ -64,11 +62,10 @@ public class ShowHideLabelsHandler extends AbstractGraphicalCommandHandler {
 

 	@Override

 	public void setEnabled(Object evaluationContext) {

-		if (this.parameter.equals(ShowHideLabelsAction.MANAGE_PARAMETER)) {

+		if (ShowHideLabelsAction.MANAGE_PARAMETER.equals(this.parameter)) {

 			// we test if the action can be executed with an other parameter (because getCommand() for this parameter open a dialog

 			ShowHideLabelsAction action = new ShowHideLabelsAction(ShowHideLabelsAction.SHOW_PARAMETER, getSelectedElements());

 			setBaseEnabled(action.getCommand().canExecute());

-			return;

 		} else {

 			super.setEnabled(evaluationContext);

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ShowHideRelatedLinkHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ShowHideRelatedLinkHandler.java
index a15a6ffd974..eff1e49f06a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ShowHideRelatedLinkHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ShowHideRelatedLinkHandler.java
@@ -57,7 +57,7 @@ import org.eclipse.ui.IWorkbenchPartSite;
 public class ShowHideRelatedLinkHandler extends AbstractHandler implements IExecutableExtension {

 

 	/** the current selection */

-	protected final List<EditPart> selection = new ArrayList<EditPart>();

+	protected final List<EditPart> selection = new ArrayList<>();

 

 	/**

 	 * the parameter for this handler

@@ -164,10 +164,10 @@ public class ShowHideRelatedLinkHandler extends AbstractHandler implements IExec
 	 */

 	protected void buildSelection() {

 		this.selection.clear();

-		final ISelection selection = getSelectionInCurrentEditor();

-		if (selection instanceof IStructuredSelection) {

-			final Collection<EObject> eobjectsAlreadyManaged = new ArrayList<EObject>();

-			final Iterator<?> iter = ((IStructuredSelection) selection).iterator();

+		final ISelection iSelection = getSelectionInCurrentEditor();

+		if (iSelection instanceof IStructuredSelection) {

+			final Collection<EObject> eobjectsAlreadyManaged = new ArrayList<>();

+			final Iterator<?> iter = ((IStructuredSelection) iSelection).iterator();

 			while (iter.hasNext()) {

 				final Object current = iter.next();

 				if (current instanceof EditPart) {