Bug 515367 - [releng] Uniformization of the end of lines to Unix standard

- Format the EOL of all the files matched by: grep -rIUs . | xargs -Ifile dos2unix -k 'file'

Change-Id: I5c41d540a9a67b50de9b912ab35e16cc9a912961
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

110 files changed, 53825 insertions, 53825 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/AbstractionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/AbstractionCreateCommand.java
index 7e65fd78597..94f95ea1cc1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/AbstractionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/AbstractionCreateCommand.java
@@ -1,172 +1,172 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is 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.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class AbstractionCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public AbstractionCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateAbstraction_Edge(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

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

-		if (!canExecute()) {

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

-		}

-

-		Abstraction newElement = UMLFactory.eINSTANCE.createAbstraction();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Abstraction_Edge(newElement);

-		doConfigure(newElement, monitor, info);

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

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Abstraction newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new 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; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		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.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Abstraction;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * @generated
+ */
+public class AbstractionCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	protected final EObject source;
+
+	/**
+	 * @generated
+	 */
+	protected final EObject target;
+
+	/**
+	 * @generated
+	 */
+	protected Package container;
+
+	/**
+	 * @generated
+	 */
+	public AbstractionCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
+		super(request.getLabel(), null, request);
+		this.source = source;
+		this.target = target;
+		container = deduceContainer(source, target);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		if (source == null && target == null) {
+			return false;
+		}
+		if (source != null && false == source instanceof NamedElement) {
+			return false;
+		}
+		if (target != null && false == target instanceof NamedElement) {
+			return false;
+		}
+		if (getSource() == null) {
+			return true; // link creation is in progress; source is not defined yet
+		}
+		// target may be null here but it's possible to check constraint
+		if (getContainer() == null) {
+			return false;
+		}
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateAbstraction_Edge(getContainer(), getSource(), getTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		if (!canExecute()) {
+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
+		}
+
+		Abstraction newElement = UMLFactory.eINSTANCE.createAbstraction();
+		getContainer().getPackagedElements()
+				.add(newElement);
+		newElement.getClients()
+				.add(getSource());
+		newElement.getSuppliers()
+				.add(getTarget());
+		ElementInitializers.getInstance().init_Abstraction_Edge(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Abstraction newElement, IProgressMonitor monitor, IAdaptable info)
+			throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setElementToEdit(EObject element) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getSource() {
+		return (NamedElement) source;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getTarget() {
+		return (NamedElement) target;
+	}
+
+	/**
+	 * @generated
+	 */
+	public Package getContainer() {
+		return container;
+	}
+
+	/**
+	 * Default approach is to traverse ancestors of the source to find instance of container.
+	 * Modify with appropriate logic.
+	 *
+	 * @generated
+	 */
+	protected Package deduceContainer(EObject source, EObject target) {
+		// Find container element for the new 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; element = element.eContainer()) {
+			if (element instanceof Package) {
+				return (Package) element;
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentAnnotatedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentAnnotatedElementCreateCommand.java
index 68cd75ffad6..cea9cc05cc3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentAnnotatedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentAnnotatedElementCreateCommand.java
@@ -1,108 +1,108 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is 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.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * @generated

- */

-public class CommentAnnotatedElementCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public CommentAnnotatedElementCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof Comment) {

-			return false;

-		}

-		if (target != null && false == target instanceof Element) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateComment_AnnotatedElementEdge(getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

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

-		if (!canExecute()) {

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

-		}

-

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

-			getSource().getAnnotatedElements()

-					.add(getTarget());

-		}

-		return CommandResult.newOKCommandResult();

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Comment getSource() {

-		return (Comment) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Element getTarget() {

-		return (Element) target;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is 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.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Element;
+
+/**
+ * @generated
+ */
+public class CommentAnnotatedElementCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	protected final EObject source;
+
+	/**
+	 * @generated
+	 */
+	protected final EObject target;
+
+	/**
+	 * @generated
+	 */
+	public CommentAnnotatedElementCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
+		super(request.getLabel(), null, request);
+		this.source = source;
+		this.target = target;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		if (source == null && target == null) {
+			return false;
+		}
+		if (source != null && false == source instanceof Comment) {
+			return false;
+		}
+		if (target != null && false == target instanceof Element) {
+			return false;
+		}
+		if (getSource() == null) {
+			return true; // link creation is in progress; source is not defined yet
+		}
+		// target may be null here but it's possible to check constraint
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateComment_AnnotatedElementEdge(getSource(), getTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		if (!canExecute()) {
+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
+		}
+
+		if (getSource() != null && getTarget() != null) {
+			getSource().getAnnotatedElements()
+					.add(getTarget());
+		}
+		return CommandResult.newOKCommandResult();
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setElementToEdit(EObject element) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Comment getSource() {
+		return (Comment) source;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Element getTarget() {
+		return (Element) target;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentAnnotatedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentAnnotatedElementReorientCommand.java
index 90279e47b7f..003a0531e69 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentAnnotatedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentAnnotatedElementReorientCommand.java
@@ -1,165 +1,165 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is 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.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * @generated

- */

-public class CommentAnnotatedElementReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject referenceOwner;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public CommentAnnotatedElementReorientCommand(ReorientReferenceRelationshipRequest request) {

-		super(request.getLabel(), null, request);

-		reorientDirection = request.getDirection();

-		referenceOwner = request.getReferenceOwner();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == referenceOwner instanceof Comment) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof Element && newEnd instanceof Comment)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistComment_AnnotatedElementEdge(getNewSource(), getOldTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Element && newEnd instanceof Element)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistComment_AnnotatedElementEdge(getOldSource(), getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

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

-		if (!canExecute()) {

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

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getOldSource().getAnnotatedElements()

-				.remove(getOldTarget());

-		getNewSource().getAnnotatedElements()

-				.add(getOldTarget());

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().getAnnotatedElements()

-				.remove(getOldTarget());

-		getOldSource().getAnnotatedElements()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Comment getOldSource() {

-		return (Comment) referenceOwner;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Comment getNewSource() {

-		return (Comment) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Element getOldTarget() {

-		return (Element) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Element getNewTarget() {

-		return (Element) newEnd;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is 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.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Element;
+
+/**
+ * @generated
+ */
+public class CommentAnnotatedElementReorientCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private final int reorientDirection;
+
+	/**
+	 * @generated
+	 */
+	private final EObject referenceOwner;
+
+	/**
+	 * @generated
+	 */
+	private final EObject oldEnd;
+
+	/**
+	 * @generated
+	 */
+	private final EObject newEnd;
+
+	/**
+	 * @generated
+	 */
+	public CommentAnnotatedElementReorientCommand(ReorientReferenceRelationshipRequest request) {
+		super(request.getLabel(), null, request);
+		reorientDirection = request.getDirection();
+		referenceOwner = request.getReferenceOwner();
+		oldEnd = request.getOldRelationshipEnd();
+		newEnd = request.getNewRelationshipEnd();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		if (false == referenceOwner instanceof Comment) {
+			return false;
+		}
+		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {
+			return canReorientSource();
+		}
+		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {
+			return canReorientTarget();
+		}
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean canReorientSource() {
+		if (!(oldEnd instanceof Element && newEnd instanceof Comment)) {
+			return false;
+		}
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistComment_AnnotatedElementEdge(getNewSource(), getOldTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean canReorientTarget() {
+		if (!(oldEnd instanceof Element && newEnd instanceof Element)) {
+			return false;
+		}
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistComment_AnnotatedElementEdge(getOldSource(), getNewTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		if (!canExecute()) {
+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
+		}
+		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {
+			return reorientSource();
+		}
+		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {
+			return reorientTarget();
+		}
+		throw new IllegalStateException();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected CommandResult reorientSource() throws ExecutionException {
+		getOldSource().getAnnotatedElements()
+				.remove(getOldTarget());
+		getNewSource().getAnnotatedElements()
+				.add(getOldTarget());
+		return CommandResult.newOKCommandResult(referenceOwner);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected CommandResult reorientTarget() throws ExecutionException {
+		getOldSource().getAnnotatedElements()
+				.remove(getOldTarget());
+		getOldSource().getAnnotatedElements()
+				.add(getNewTarget());
+		return CommandResult.newOKCommandResult(referenceOwner);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Comment getOldSource() {
+		return (Comment) referenceOwner;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Comment getNewSource() {
+		return (Comment) newEnd;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Element getOldTarget() {
+		return (Element) oldEnd;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Element getNewTarget() {
+		return (Element) newEnd;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentRealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentRealizationCreateCommand.java
index 51121e4bcee..607934e9368 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentRealizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentRealizationCreateCommand.java
@@ -1,172 +1,172 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is 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.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.ComponentRealization;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class ComponentRealizationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public ComponentRealizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateComponentRealization_Edge(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

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

-		if (!canExecute()) {

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

-		}

-

-		ComponentRealization newElement = UMLFactory.eINSTANCE.createComponentRealization();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_ComponentRealization_Edge(newElement);

-		doConfigure(newElement, monitor, info);

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

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ComponentRealization newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new 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; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		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.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
+import org.eclipse.uml2.uml.ComponentRealization;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * @generated
+ */
+public class ComponentRealizationCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	protected final EObject source;
+
+	/**
+	 * @generated
+	 */
+	protected final EObject target;
+
+	/**
+	 * @generated
+	 */
+	protected Package container;
+
+	/**
+	 * @generated
+	 */
+	public ComponentRealizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
+		super(request.getLabel(), null, request);
+		this.source = source;
+		this.target = target;
+		container = deduceContainer(source, target);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		if (source == null && target == null) {
+			return false;
+		}
+		if (source != null && false == source instanceof NamedElement) {
+			return false;
+		}
+		if (target != null && false == target instanceof NamedElement) {
+			return false;
+		}
+		if (getSource() == null) {
+			return true; // link creation is in progress; source is not defined yet
+		}
+		// target may be null here but it's possible to check constraint
+		if (getContainer() == null) {
+			return false;
+		}
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateComponentRealization_Edge(getContainer(), getSource(), getTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		if (!canExecute()) {
+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
+		}
+
+		ComponentRealization newElement = UMLFactory.eINSTANCE.createComponentRealization();
+		getContainer().getPackagedElements()
+				.add(newElement);
+		newElement.getClients()
+				.add(getSource());
+		newElement.getSuppliers()
+				.add(getTarget());
+		ElementInitializers.getInstance().init_ComponentRealization_Edge(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(ComponentRealization newElement, IProgressMonitor monitor, IAdaptable info)
+			throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setElementToEdit(EObject element) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getSource() {
+		return (NamedElement) source;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getTarget() {
+		return (NamedElement) target;
+	}
+
+	/**
+	 * @generated
+	 */
+	public Package getContainer() {
+		return container;
+	}
+
+	/**
+	 * Default approach is to traverse ancestors of the source to find instance of container.
+	 * Modify with appropriate logic.
+	 *
+	 * @generated
+	 */
+	protected Package deduceContainer(EObject source, EObject target) {
+		// Find container element for the new 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; element = element.eContainer()) {
+			if (element instanceof Package) {
+				return (Package) element;
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintConstrainedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintConstrainedElementCreateCommand.java
index 4035c1349d3..b3041e753e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintConstrainedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintConstrainedElementCreateCommand.java
@@ -1,108 +1,108 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is 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.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * @generated

- */

-public class ConstraintConstrainedElementCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public ConstraintConstrainedElementCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof Constraint) {

-			return false;

-		}

-		if (target != null && false == target instanceof Element) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateConstraint_ConstrainedElementEdge(getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

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

-		if (!canExecute()) {

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

-		}

-

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

-			getSource().getConstrainedElements()

-					.add(getTarget());

-		}

-		return CommandResult.newOKCommandResult();

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Constraint getSource() {

-		return (Constraint) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Element getTarget() {

-		return (Element) target;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is 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.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.Element;
+
+/**
+ * @generated
+ */
+public class ConstraintConstrainedElementCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	protected final EObject source;
+
+	/**
+	 * @generated
+	 */
+	protected final EObject target;
+
+	/**
+	 * @generated
+	 */
+	public ConstraintConstrainedElementCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
+		super(request.getLabel(), null, request);
+		this.source = source;
+		this.target = target;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		if (source == null && target == null) {
+			return false;
+		}
+		if (source != null && false == source instanceof Constraint) {
+			return false;
+		}
+		if (target != null && false == target instanceof Element) {
+			return false;
+		}
+		if (getSource() == null) {
+			return true; // link creation is in progress; source is not defined yet
+		}
+		// target may be null here but it's possible to check constraint
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateConstraint_ConstrainedElementEdge(getSource(), getTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		if (!canExecute()) {
+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
+		}
+
+		if (getSource() != null && getTarget() != null) {
+			getSource().getConstrainedElements()
+					.add(getTarget());
+		}
+		return CommandResult.newOKCommandResult();
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setElementToEdit(EObject element) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Constraint getSource() {
+		return (Constraint) source;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Element getTarget() {
+		return (Element) target;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintConstrainedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintConstrainedElementReorientCommand.java
index 54ebd47e7df..c6c75005dee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintConstrainedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintConstrainedElementReorientCommand.java
@@ -1,165 +1,165 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is 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.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * @generated

- */

-public class ConstraintConstrainedElementReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject referenceOwner;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ConstraintConstrainedElementReorientCommand(ReorientReferenceRelationshipRequest request) {

-		super(request.getLabel(), null, request);

-		reorientDirection = request.getDirection();

-		referenceOwner = request.getReferenceOwner();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == referenceOwner instanceof Constraint) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof Element && newEnd instanceof Constraint)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraint_ConstrainedElementEdge(getNewSource(), getOldTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Element && newEnd instanceof Element)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraint_ConstrainedElementEdge(getOldSource(), getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

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

-		if (!canExecute()) {

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

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getOldSource().getConstrainedElements()

-				.remove(getOldTarget());

-		getNewSource().getConstrainedElements()

-				.add(getOldTarget());

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().getConstrainedElements()

-				.remove(getOldTarget());

-		getOldSource().getConstrainedElements()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Constraint getOldSource() {

-		return (Constraint) referenceOwner;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Constraint getNewSource() {

-		return (Constraint) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Element getOldTarget() {

-		return (Element) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Element getNewTarget() {

-		return (Element) newEnd;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is 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.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.Element;
+
+/**
+ * @generated
+ */
+public class ConstraintConstrainedElementReorientCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private final int reorientDirection;
+
+	/**
+	 * @generated
+	 */
+	private final EObject referenceOwner;
+
+	/**
+	 * @generated
+	 */
+	private final EObject oldEnd;
+
+	/**
+	 * @generated
+	 */
+	private final EObject newEnd;
+
+	/**
+	 * @generated
+	 */
+	public ConstraintConstrainedElementReorientCommand(ReorientReferenceRelationshipRequest request) {
+		super(request.getLabel(), null, request);
+		reorientDirection = request.getDirection();
+		referenceOwner = request.getReferenceOwner();
+		oldEnd = request.getOldRelationshipEnd();
+		newEnd = request.getNewRelationshipEnd();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		if (false == referenceOwner instanceof Constraint) {
+			return false;
+		}
+		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {
+			return canReorientSource();
+		}
+		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {
+			return canReorientTarget();
+		}
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean canReorientSource() {
+		if (!(oldEnd instanceof Element && newEnd instanceof Constraint)) {
+			return false;
+		}
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraint_ConstrainedElementEdge(getNewSource(), getOldTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean canReorientTarget() {
+		if (!(oldEnd instanceof Element && newEnd instanceof Element)) {
+			return false;
+		}
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraint_ConstrainedElementEdge(getOldSource(), getNewTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		if (!canExecute()) {
+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
+		}
+		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {
+			return reorientSource();
+		}
+		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {
+			return reorientTarget();
+		}
+		throw new IllegalStateException();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected CommandResult reorientSource() throws ExecutionException {
+		getOldSource().getConstrainedElements()
+				.remove(getOldTarget());
+		getNewSource().getConstrainedElements()
+				.add(getOldTarget());
+		return CommandResult.newOKCommandResult(referenceOwner);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected CommandResult reorientTarget() throws ExecutionException {
+		getOldSource().getConstrainedElements()
+				.remove(getOldTarget());
+		getOldSource().getConstrainedElements()
+				.add(getNewTarget());
+		return CommandResult.newOKCommandResult(referenceOwner);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Constraint getOldSource() {
+		return (Constraint) referenceOwner;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Constraint getNewSource() {
+		return (Constraint) newEnd;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Element getOldTarget() {
+		return (Element) oldEnd;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Element getNewTarget() {
+		return (Element) newEnd;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchCreateCommand.java
index 4c904f929ca..7bf4c1fb1cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchCreateCommand.java
@@ -1,172 +1,172 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is 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.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class DependencyBranchCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public DependencyBranchCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDependency_BranchEdge(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

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

-		if (!canExecute()) {

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

-		}

-

-		Dependency newElement = UMLFactory.eINSTANCE.createDependency();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Dependency_BranchEdge(newElement);

-		doConfigure(newElement, monitor, info);

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

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Dependency newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new 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; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		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.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Dependency;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * @generated
+ */
+public class DependencyBranchCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	protected final EObject source;
+
+	/**
+	 * @generated
+	 */
+	protected final EObject target;
+
+	/**
+	 * @generated
+	 */
+	protected Package container;
+
+	/**
+	 * @generated
+	 */
+	public DependencyBranchCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
+		super(request.getLabel(), null, request);
+		this.source = source;
+		this.target = target;
+		container = deduceContainer(source, target);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		if (source == null && target == null) {
+			return false;
+		}
+		if (source != null && false == source instanceof NamedElement) {
+			return false;
+		}
+		if (target != null && false == target instanceof NamedElement) {
+			return false;
+		}
+		if (getSource() == null) {
+			return true; // link creation is in progress; source is not defined yet
+		}
+		// target may be null here but it's possible to check constraint
+		if (getContainer() == null) {
+			return false;
+		}
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDependency_BranchEdge(getContainer(), getSource(), getTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		if (!canExecute()) {
+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
+		}
+
+		Dependency newElement = UMLFactory.eINSTANCE.createDependency();
+		getContainer().getPackagedElements()
+				.add(newElement);
+		newElement.getClients()
+				.add(getSource());
+		newElement.getSuppliers()
+				.add(getTarget());
+		ElementInitializers.getInstance().init_Dependency_BranchEdge(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Dependency newElement, IProgressMonitor monitor, IAdaptable info)
+			throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setElementToEdit(EObject element) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getSource() {
+		return (NamedElement) source;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getTarget() {
+		return (NamedElement) target;
+	}
+
+	/**
+	 * @generated
+	 */
+	public Package getContainer() {
+		return container;
+	}
+
+	/**
+	 * Default approach is to traverse ancestors of the source to find instance of container.
+	 * Modify with appropriate logic.
+	 *
+	 * @generated
+	 */
+	protected Package deduceContainer(EObject source, EObject target) {
+		// Find container element for the new 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; element = element.eContainer()) {
+			if (element instanceof Package) {
+				return (Package) element;
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchReorientCommand.java
index f106a2f4481..aa54568477c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchReorientCommand.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.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class DependencyBranchReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public DependencyBranchReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Dependency) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

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

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_BranchEdge(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

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

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_BranchEdge(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

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

-		if (!canExecute()) {

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

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Dependency getLink() {

-		return (Dependency) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is 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.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.uml2.uml.Dependency;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
+
+/**
+ * @generated
+ */
+public class DependencyBranchReorientCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private final int reorientDirection;
+
+	/**
+	 * @generated
+	 */
+	private final EObject oldEnd;
+
+	/**
+	 * @generated
+	 */
+	private final EObject newEnd;
+
+	/**
+	 * @generated
+	 */
+	public DependencyBranchReorientCommand(ReorientRelationshipRequest request) {
+		super(request.getLabel(), request.getRelationship(), request);
+		reorientDirection = request.getDirection();
+		oldEnd = request.getOldRelationshipEnd();
+		newEnd = request.getNewRelationshipEnd();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		if (false == getElementToEdit() instanceof Dependency) {
+			return false;
+		}
+		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {
+			return canReorientSource();
+		}
+		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {
+			return canReorientTarget();
+		}
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean canReorientSource() {
+		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
+			return false;
+		}
+		if (getLink().getSuppliers()
+				.size() != 1) {
+			return false;
+		}
+		NamedElement target = getLink().getSuppliers()
+				.get(0);
+		if (!(getLink().eContainer() instanceof Package)) {
+			return false;
+		}
+		Package container = (Package) getLink().eContainer();
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_BranchEdge(container, getLink(), getNewSource(), target);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean canReorientTarget() {
+		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
+			return false;
+		}
+		if (getLink().getClients()
+				.size() != 1) {
+			return false;
+		}
+		NamedElement source = getLink().getClients()
+				.get(0);
+		if (!(getLink().eContainer() instanceof Package)) {
+			return false;
+		}
+		Package container = (Package) getLink().eContainer();
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_BranchEdge(container, getLink(), source, getNewTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		if (!canExecute()) {
+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
+		}
+		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {
+			return reorientSource();
+		}
+		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {
+			return reorientTarget();
+		}
+		throw new IllegalStateException();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected CommandResult reorientSource() throws ExecutionException {
+		getLink().getClients()
+				.remove(getOldSource());
+		getLink().getClients()
+				.add(getNewSource());
+		return CommandResult.newOKCommandResult(getLink());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected CommandResult reorientTarget() throws ExecutionException {
+		getLink().getSuppliers()
+				.remove(getOldTarget());
+		getLink().getSuppliers()
+				.add(getNewTarget());
+		return CommandResult.newOKCommandResult(getLink());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Dependency getLink() {
+		return (Dependency) getElementToEdit();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getOldSource() {
+		return (NamedElement) oldEnd;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getNewSource() {
+		return (NamedElement) newEnd;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getOldTarget() {
+		return (NamedElement) oldEnd;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getNewTarget() {
+		return (NamedElement) newEnd;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyCreateCommand.java
index cb061d15100..c36be689037 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyCreateCommand.java
@@ -1,172 +1,172 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is 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.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class DependencyCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public DependencyCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDependency_Edge(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

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

-		if (!canExecute()) {

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

-		}

-

-		Dependency newElement = UMLFactory.eINSTANCE.createDependency();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Dependency_Edge(newElement);

-		doConfigure(newElement, monitor, info);

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

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Dependency newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new 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; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		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.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Dependency;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * @generated
+ */
+public class DependencyCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	protected final EObject source;
+
+	/**
+	 * @generated
+	 */
+	protected final EObject target;
+
+	/**
+	 * @generated
+	 */
+	protected Package container;
+
+	/**
+	 * @generated
+	 */
+	public DependencyCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
+		super(request.getLabel(), null, request);
+		this.source = source;
+		this.target = target;
+		container = deduceContainer(source, target);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		if (source == null && target == null) {
+			return false;
+		}
+		if (source != null && false == source instanceof NamedElement) {
+			return false;
+		}
+		if (target != null && false == target instanceof NamedElement) {
+			return false;
+		}
+		if (getSource() == null) {
+			return true; // link creation is in progress; source is not defined yet
+		}
+		// target may be null here but it's possible to check constraint
+		if (getContainer() == null) {
+			return false;
+		}
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDependency_Edge(getContainer(), getSource(), getTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		if (!canExecute()) {
+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
+		}
+
+		Dependency newElement = UMLFactory.eINSTANCE.createDependency();
+		getContainer().getPackagedElements()
+				.add(newElement);
+		newElement.getClients()
+				.add(getSource());
+		newElement.getSuppliers()
+				.add(getTarget());
+		ElementInitializers.getInstance().init_Dependency_Edge(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Dependency newElement, IProgressMonitor monitor, IAdaptable info)
+			throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setElementToEdit(EObject element) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getSource() {
+		return (NamedElement) source;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getTarget() {
+		return (NamedElement) target;
+	}
+
+	/**
+	 * @generated
+	 */
+	public Package getContainer() {
+		return container;
+	}
+
+	/**
+	 * Default approach is to traverse ancestors of the source to find instance of container.
+	 * Modify with appropriate logic.
+	 *
+	 * @generated
+	 */
+	protected Package deduceContainer(EObject source, EObject target) {
+		// Find container element for the new 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; element = element.eContainer()) {
+			if (element instanceof Package) {
+				return (Package) element;
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ManifestationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ManifestationCreateCommand.java
index 230cc9bfa83..a0c19f69253 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ManifestationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/ManifestationCreateCommand.java
@@ -1,172 +1,172 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is 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.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Manifestation;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class ManifestationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public ManifestationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateManifestation_Edge(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

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

-		if (!canExecute()) {

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

-		}

-

-		Manifestation newElement = UMLFactory.eINSTANCE.createManifestation();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Manifestation_Edge(newElement);

-		doConfigure(newElement, monitor, info);

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

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Manifestation newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new 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; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		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.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Manifestation;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * @generated
+ */
+public class ManifestationCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	protected final EObject source;
+
+	/**
+	 * @generated
+	 */
+	protected final EObject target;
+
+	/**
+	 * @generated
+	 */
+	protected Package container;
+
+	/**
+	 * @generated
+	 */
+	public ManifestationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
+		super(request.getLabel(), null, request);
+		this.source = source;
+		this.target = target;
+		container = deduceContainer(source, target);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		if (source == null && target == null) {
+			return false;
+		}
+		if (source != null && false == source instanceof NamedElement) {
+			return false;
+		}
+		if (target != null && false == target instanceof NamedElement) {
+			return false;
+		}
+		if (getSource() == null) {
+			return true; // link creation is in progress; source is not defined yet
+		}
+		// target may be null here but it's possible to check constraint
+		if (getContainer() == null) {
+			return false;
+		}
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateManifestation_Edge(getContainer(), getSource(), getTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		if (!canExecute()) {
+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
+		}
+
+		Manifestation newElement = UMLFactory.eINSTANCE.createManifestation();
+		getContainer().getPackagedElements()
+				.add(newElement);
+		newElement.getClients()
+				.add(getSource());
+		newElement.getSuppliers()
+				.add(getTarget());
+		ElementInitializers.getInstance().init_Manifestation_Edge(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Manifestation newElement, IProgressMonitor monitor, IAdaptable info)
+			throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setElementToEdit(EObject element) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getSource() {
+		return (NamedElement) source;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getTarget() {
+		return (NamedElement) target;
+	}
+
+	/**
+	 * @generated
+	 */
+	public Package getContainer() {
+		return container;
+	}
+
+	/**
+	 * Default approach is to traverse ancestors of the source to find instance of container.
+	 * Modify with appropriate logic.
+	 *
+	 * @generated
+	 */
+	protected Package deduceContainer(EObject source, EObject target) {
+		// Find container element for the new 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; element = element.eContainer()) {
+			if (element instanceof Package) {
+				return (Package) element;
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/SubstitutionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/SubstitutionCreateCommand.java
index b027f82cadf..8d188fca828 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/SubstitutionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/SubstitutionCreateCommand.java
@@ -1,172 +1,172 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is 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.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Substitution;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class SubstitutionCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public SubstitutionCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateSubstitution_Edge(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

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

-		if (!canExecute()) {

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

-		}

-

-		Substitution newElement = UMLFactory.eINSTANCE.createSubstitution();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Substitution_Edge(newElement);

-		doConfigure(newElement, monitor, info);

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

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Substitution newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new 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; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		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.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Substitution;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * @generated
+ */
+public class SubstitutionCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	protected final EObject source;
+
+	/**
+	 * @generated
+	 */
+	protected final EObject target;
+
+	/**
+	 * @generated
+	 */
+	protected Package container;
+
+	/**
+	 * @generated
+	 */
+	public SubstitutionCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
+		super(request.getLabel(), null, request);
+		this.source = source;
+		this.target = target;
+		container = deduceContainer(source, target);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		if (source == null && target == null) {
+			return false;
+		}
+		if (source != null && false == source instanceof NamedElement) {
+			return false;
+		}
+		if (target != null && false == target instanceof NamedElement) {
+			return false;
+		}
+		if (getSource() == null) {
+			return true; // link creation is in progress; source is not defined yet
+		}
+		// target may be null here but it's possible to check constraint
+		if (getContainer() == null) {
+			return false;
+		}
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateSubstitution_Edge(getContainer(), getSource(), getTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		if (!canExecute()) {
+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
+		}
+
+		Substitution newElement = UMLFactory.eINSTANCE.createSubstitution();
+		getContainer().getPackagedElements()
+				.add(newElement);
+		newElement.getClients()
+				.add(getSource());
+		newElement.getSuppliers()
+				.add(getTarget());
+		ElementInitializers.getInstance().init_Substitution_Edge(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Substitution newElement, IProgressMonitor monitor, IAdaptable info)
+			throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setElementToEdit(EObject element) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getSource() {
+		return (NamedElement) source;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getTarget() {
+		return (NamedElement) target;
+	}
+
+	/**
+	 * @generated
+	 */
+	public Package getContainer() {
+		return container;
+	}
+
+	/**
+	 * Default approach is to traverse ancestors of the source to find instance of container.
+	 * Modify with appropriate logic.
+	 *
+	 * @generated
+	 */
+	protected Package deduceContainer(EObject source, EObject target) {
+		// Find container element for the new 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; element = element.eContainer()) {
+			if (element instanceof Package) {
+				return (Package) element;
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/UsageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/UsageCreateCommand.java
index c1ba43d5485..2433c917c46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/UsageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/UsageCreateCommand.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.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.Usage;

-

-/**

- * @generated

- */

-public class UsageCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public UsageCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateUsage_Edge(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

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

-		if (!canExecute()) {

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

-		}

-

-		Usage newElement = UMLFactory.eINSTANCE.createUsage();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Usage_Edge(newElement);

-		doConfigure(newElement, monitor, info);

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

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Usage newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new 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; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		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.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+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.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.Usage;
+
+/**
+ * @generated
+ */
+public class UsageCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	protected final EObject source;
+
+	/**
+	 * @generated
+	 */
+	protected final EObject target;
+
+	/**
+	 * @generated
+	 */
+	protected Package container;
+
+	/**
+	 * @generated
+	 */
+	public UsageCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
+		super(request.getLabel(), null, request);
+		this.source = source;
+		this.target = target;
+		container = deduceContainer(source, target);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		if (source == null && target == null) {
+			return false;
+		}
+		if (source != null && false == source instanceof NamedElement) {
+			return false;
+		}
+		if (target != null && false == target instanceof NamedElement) {
+			return false;
+		}
+		if (getSource() == null) {
+			return true; // link creation is in progress; source is not defined yet
+		}
+		// target may be null here but it's possible to check constraint
+		if (getContainer() == null) {
+			return false;
+		}
+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateUsage_Edge(getContainer(), getSource(), getTarget());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		if (!canExecute()) {
+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
+		}
+
+		Usage newElement = UMLFactory.eINSTANCE.createUsage();
+		getContainer().getPackagedElements()
+				.add(newElement);
+		newElement.getClients()
+				.add(getSource());
+		newElement.getSuppliers()
+				.add(getTarget());
+		ElementInitializers.getInstance().init_Usage_Edge(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Usage newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setElementToEdit(EObject element) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getSource() {
+		return (NamedElement) source;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected NamedElement getTarget() {
+		return (NamedElement) target;
+	}
+
+	/**
+	 * @generated
+	 */
+	public Package getContainer() {
+		return container;
+	}
+
+	/**
+	 * Default approach is to traverse ancestors of the source to find instance of container.
+	 * Modify with appropriate logic.
+	 *
+	 * @generated
+	 */
+	protected Package deduceContainer(EObject source, EObject target) {
+		// Find container element for the new 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; element = element.eContainer()) {
+			if (element instanceof Package) {
+				return (Package) element;
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ModelEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ModelEditHelper.java
index 62231029d91..e652a9d9ed6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ModelEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ModelEditHelper.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.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ModelEditHelper extends UMLBaseEditHelper {

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is 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.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
+
+/**
+ * @generated
+ */
+public class ModelEditHelper extends UMLBaseEditHelper {
+}
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 0ad49f2aeb9..c32c5d24b55 100755
--- 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,21 +1,21 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is available at

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

-  *

-  * Contributors:

-  *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.infra.gmfdiag.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.papyrus.infra.gmfdiag.tooling.runtime.edit.helpers.GeneratedEditHelperBase;
+
+/**
+ * @generated
+ */
+public class UMLBaseEditHelper extends GeneratedEditHelperBase {
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.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 e46dc65a56c..639f246e1d7 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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(), 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) {

-			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 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 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(), 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) {
+			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 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 ab73f9cba1c..70ba266cdf7 100755
--- 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,128 +1,128 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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(AppliedStereotypeLabelDisplayEditPolicy.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(AppliedStereotypeLabelDisplayEditPolicy.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 fe6bc8302ff..aa438528900 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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(), 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) {

-			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 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 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(), 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) {
+			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 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 d2b1665c2da..80e66e21954 100755
--- 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,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.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 5086a238917..35ea995c180 100755
--- 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,859 +1,859 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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 bd9bb7bc95d..d0bb7b7ce3a 100755
--- 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,859 +1,859 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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 56b66d95c3f..722c3ad5d70 100755
--- 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,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.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/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 aaf58c0eae0..98a14c456eb 100755
--- 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,139 +1,139 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.editpolicies.BorderDisplayEditPolicy;

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

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

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

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

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

-import org.eclipse.papyrus.uml.diagram.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.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.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 8730cf07ab5..2d6b6630bea 100755
--- 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,139 +1,139 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.editpolicies.BorderDisplayEditPolicy;

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

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

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

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

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

-import org.eclipse.papyrus.uml.diagram.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.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.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 7e88f93c8e4..54fffc3eca2 100755
--- 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,139 +1,139 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.editpolicies.BorderDisplayEditPolicy;

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

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

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

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

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

-import org.eclipse.papyrus.uml.diagram.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.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.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/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 29093a7b44d..84ce2de5e1c 100755
--- 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,398 +1,398 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 847e8f52900..d19749ce053 100755
--- 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,398 +1,398 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 870864d9a6e..1ae3c5bee2f 100755
--- 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,398 +1,398 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 8dc16481a79..62abb6bb66b 100755
--- 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,843 +1,843 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 78853b4174c..d244c20a85f 100755
--- 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,843 +1,843 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 71665996552..b2860c1de1b 100755
--- 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,843 +1,843 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 000667a20b4..e597f371872 100755
--- 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,864 +1,864 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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() {

-		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());

-	}

-

-	/**

-	 * @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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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() {
+		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());
+	}
+
+	/**
+	 * @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 ac361f9904a..4bcfc0d93a2 100755
--- 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,864 +1,864 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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() {

-		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());

-	}

-

-	/**

-	 * @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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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() {
+		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());
+	}
+
+	/**
+	 * @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 1f9f7c6ea45..910a863bcb8 100755
--- 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,859 +1,859 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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 e1f9b63777f..3e50bb5f268 100755
--- 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,826 +1,826 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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 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) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

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

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

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

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

-		}

-		if (resolveSemanticElement() instanceof Feature) {

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

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

-			} else {

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

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

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

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

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

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

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

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

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

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

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

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

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

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

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

-	 *

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

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

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

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), 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 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 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) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			} else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			} else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), 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 b520ec02a18..621e9a0fc8f 100755
--- 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,128 +1,128 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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(AppliedStereotypeLabelDisplayEditPolicy.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(AppliedStereotypeLabelDisplayEditPolicy.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 17bd37dfe57..f1f1a9d1f92 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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(), 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) {

-			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 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 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(), 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) {
+			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 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 f9a83588902..21808059794 100755
--- 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,818 +1,818 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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(), 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) {

-			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 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 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(), 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) {
+			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 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 dbf7a9b8639..f6a1143959c 100755
--- 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,123 +1,123 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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(AppliedStereotypeLabelDisplayEditPolicy.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(AppliedStereotypeLabelDisplayEditPolicy.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 07b3702f14f..b024cbdf492 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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(), 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) {

-			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 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 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(), 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) {
+			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 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 94741b47c37..0d8ff748889 100755
--- 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,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.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 ca57b7a0c07..1798dc94ccb 100755
--- 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,292 +1,292 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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/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 331ec68a2d1..5ae485db38e 100755
--- 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,864 +1,864 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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() {

-		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());

-	}

-

-	/**

-	 * @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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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() {
+		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());
+	}
+
+	/**
+	 * @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 725f7974168..ed6ef80d52f 100755
--- 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,864 +1,864 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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() {

-		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());

-	}

-

-	/**

-	 * @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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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() {
+		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());
+	}
+
+	/**
+	 * @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 c50216d9710..868eeff3957 100755
--- 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,864 +1,864 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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() {

-		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());

-	}

-

-	/**

-	 * @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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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() {
+		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());
+	}
+
+	/**
+	 * @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 40eb10728ad..f1adabfae9b 100755
--- 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,864 +1,864 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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() {

-		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());

-	}

-

-	/**

-	 * @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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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() {
+		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());
+	}
+
+	/**
+	 * @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 54257125738..64e655f1130 100755
--- 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,288 +1,288 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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

-	 **/

-	@Override

-	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.RoundedCompartmentFigure

-	 * 

-	 * @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.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
+	 **/
+	@Override
+	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.RoundedCompartmentFigure
+	 * 
+	 * @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 f09fd76c1fd..9dc7fc15f56 100755
--- 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,859 +1,859 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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 f0bf57621cc..1af4349865d 100755
--- 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,826 +1,826 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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 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) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

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

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

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

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

-		}

-		if (resolveSemanticElement() instanceof Feature) {

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

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

-			} else {

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

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

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

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

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

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

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

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

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

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

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

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

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

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

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

-	 *

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

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

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

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), 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 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 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) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			} else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			} else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), 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 86ae901bb83..97fc3e5a8a3 100755
--- 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,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.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 695e3939222..23c15b1ce0b 100755
--- 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,128 +1,128 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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(AppliedStereotypeLabelDisplayEditPolicy.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(AppliedStereotypeLabelDisplayEditPolicy.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 53880b685d9..f6a2c9348f1 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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(), 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) {

-			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 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 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(), 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) {
+			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 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 e46f4b20f22..12341cfe5b1 100755
--- 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,254 +1,254 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.RoundedCompartmentFigure

-	 * 

-	 * @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.RoundedCompartmentFigure
+	 * 
+	 * @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 c3f69d44298..09516e72a9b 100755
--- 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,843 +1,843 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 104fc8a25dd..2e427127170 100755
--- 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,826 +1,826 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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 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) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

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

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

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

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

-		}

-		if (resolveSemanticElement() instanceof Feature) {

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

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

-			} else {

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

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

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

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

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

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

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

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

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

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

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

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

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

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

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

-	 *

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

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

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

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), 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 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 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) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			} else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			} else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), 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 e10ed47c0a8..3876bc44b90 100755
--- 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(AppliedStereotypeLabelDisplayEditPolicy.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(AppliedStereotypeLabelDisplayEditPolicy.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 a1015443c14..ec2278673fc 100755
--- 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,146 +1,146 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 d32e055d006..3eff111400b 100755
--- 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,145 +1,145 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 0cdb9b2732a..d52d1bb34a8 100755
--- 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,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.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/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 d1b5392c1f8..ee6efc069cc 100755
--- 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,843 +1,843 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 c4636e108f7..a331504c3fa 100755
--- 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,843 +1,843 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 3db78531c27..0341c6aa23d 100755
--- 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,859 +1,859 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 5d1e554c689..5d96c090f8c 100755
--- 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,859 +1,859 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 dc9c224b827..80f6c6be4a1 100755
--- 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,146 +1,146 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 2c2c0278786..335d1b2e242 100755
--- 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,145 +1,145 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 eaea0c0642e..48f9c94bcc0 100755
--- 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,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.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 38da36ed129..cd30ce32860 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 1450cb22a54..f8a897a76c5 100755
--- 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,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.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(AppliedStereotypeLabelDisplayEditPolicy.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(AppliedStereotypeLabelDisplayEditPolicy.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 a0ded0cc7b8..ea6468c6d61 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 2fbf8d407d0..0a330f10c7c 100755
--- 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,73 +1,73 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 6a754627863..30908fab073 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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(), 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) {

-			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 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 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(), 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) {
+			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 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 e6674e27781..d98e14b8888 100755
--- 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,128 +1,128 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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(AppliedStereotypeLabelDisplayEditPolicy.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(AppliedStereotypeLabelDisplayEditPolicy.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 9137e51a98c..51152b27093 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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(), 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) {

-			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 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 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(), 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) {
+			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 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 6bd7b613eab..579ff564d82 100755
--- 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 dfa54a91880..84a6b511621 100755
--- 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 9932758f965..faacbc7b522 100755
--- 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,864 +1,864 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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() {

-		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());

-	}

-

-	/**

-	 * @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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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() {
+		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());
+	}
+
+	/**
+	 * @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 4883d66e3f2..89e67a8b53e 100755
--- 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,864 +1,864 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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() {

-		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());

-	}

-

-	/**

-	 * @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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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() {
+		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());
+	}
+
+	/**
+	 * @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 8f55a7c72ac..ce7fd4e6ca0 100755
--- 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,137 +1,137 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

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

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

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

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

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

-import org.eclipse.papyrus.uml.diagram.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.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.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 d5de8a6d0e1..24ffbce35fa 100755
--- 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,137 +1,137 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

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

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

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

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

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

-import org.eclipse.papyrus.uml.diagram.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.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.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 e9bf45a3459..ad11f8a213b 100755
--- 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,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.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) {

-			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 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) {
+			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 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 39d968d69c8..79de18011fb 100755
--- 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,862 +1,862 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 4b4db45d792..a9516b20f1e 100755
--- 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 575befe4496..ffc606feca4 100755
--- 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 9972d59ba00..3f6cf6895e6 100755
--- 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,864 +1,864 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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() {

-		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());

-	}

-

-	/**

-	 * @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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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() {
+		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());
+	}
+
+	/**
+	 * @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 7ee9fc5ee28..caa11e8a97a 100755
--- 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,864 +1,864 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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() {

-		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());

-	}

-

-	/**

-	 * @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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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() {
+		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());
+	}
+
+	/**
+	 * @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 1e0c0567041..a913c6b23da 100755
--- 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,137 +1,137 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

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

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

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

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

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

-import org.eclipse.papyrus.uml.diagram.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.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.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 f35d5cbc1c0..04032467da1 100755
--- 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,137 +1,137 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

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

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

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

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

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

-import org.eclipse.papyrus.uml.diagram.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.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.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 3443e1aeb09..fb41feaa61c 100755
--- 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,854 +1,854 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

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

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

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

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

-		}

-		if (resolveSemanticElement() instanceof Feature) {

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

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

-			} else {

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

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

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

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

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

-				NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

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

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

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

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

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

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

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

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

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

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

-	 *

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

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

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

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), 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) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			} else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			} else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), 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 9ef953dc153..9ec729e92f3 100755
--- 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,292 +1,292 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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(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));
+	}
+
+}
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 0c19ccb8560..bdf686012e5 100755
--- 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,862 +1,862 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 ea8264df253..e1d521249c2 100755
--- 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,331 +1,331 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 3a73b1193f5..d02ab8be129 100755
--- 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,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.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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPropertyLabelEditPolicy;

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

-		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());

-	}

-

-	/**

-	 * @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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPropertyLabelEditPolicy;
+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 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() {
+		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());
+	}
+
+	/**
+	 * @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 10019e2a681..16a10fc620e 100755
--- 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,857 +1,857 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 2bade6c0d27..f239c95bdd3 100755
--- 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,399 +1,399 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 b7cdd75b785..deb6f817cd6 100755
--- 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,399 +1,399 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 1a4c37f8a4c..e1993439f78 100755
--- 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,843 +1,843 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 46632e867c7..5efa0c90596 100755
--- 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,843 +1,843 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 07cddb30ae3..38b617af99a 100755
--- 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,864 +1,864 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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() {

-		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());

-	}

-

-	/**

-	 * @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.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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() {
+		return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer());
+	}
+
+	/**
+	 * @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 7377532dcc5..eff65ed2b29 100755
--- 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,859 +1,859 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.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.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.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.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 b3e5e4c94bf..8dcc34bc5c8 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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(), 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) {

-			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 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 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(), 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) {
+			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 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 56e148f675a..abc488c0a38 100755
--- 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,128 +1,128 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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(AppliedStereotypeLabelDisplayEditPolicy.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(AppliedStereotypeLabelDisplayEditPolicy.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 fa57cc1338b..cc213747481 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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 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(), 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) {

-			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 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 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(), 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) {
+			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 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 c92468dfa51..213fd1a18f4 100755
--- 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,410 +1,410 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.jface.viewers.CellEditor;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator.CellEditorLocatorAccess;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;

-import org.eclipse.papyrus.uml.diagram.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.jface.viewers.CellEditor;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator.CellEditorLocatorAccess;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;
+import org.eclipse.papyrus.uml.diagram.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 56a93e5eace..fa11cc91f93 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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 3afa6ca04a0..b9fad237d71 100755
--- 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,128 +1,128 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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(AppliedStereotypeLabelDisplayEditPolicy.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(AppliedStereotypeLabelDisplayEditPolicy.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 5cc1ba84247..d7cda7e1661 100755
--- 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,834 +1,834 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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) {

-			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 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) {
+			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 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/DefaultNamedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
index bf1fe9c2e1b..e18fce268b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
@@ -1,251 +1,251 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is 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.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

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

-import org.eclipse.emf.edit.command.DeleteCommand;

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

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-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.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-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.notation.View;

-import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

-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.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-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.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-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.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

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

-

-/**

- * @generated

- */

-public class DefaultNamedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DefaultNamedElementItemSemanticEditPolicy() {

-		super(UMLElementTypes.NamedElement_DefaultShape);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		View view = (View) getHost().getModel();

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

-		if (annotation == null) {

-			// there are indirectly referenced children, need extra commands: false

-			addDestroyShortcutsCommand(cmd, view);

-			// delete host element

-			List<EObject> todestroy = new ArrayList<>();

-			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		} else {

-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

-		}

-		return getGEFWrapper(cmd.reduce());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-

-		if (UMLElementTypes.Usage_Edge == baseElementType) {

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_Edge == baseElementType) {

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_Edge == baseElementType) {

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_Edge == baseElementType) {

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_Edge == baseElementType) {

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_Edge == baseElementType) {

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_Edge == baseElementType) {

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_BranchEdge == baseElementType) {

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-

-		if (UMLElementTypes.Usage_Edge == baseElementType) {

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_Edge == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_Edge == baseElementType) {

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_Edge == baseElementType) {

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_Edge == baseElementType) {

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_Edge == baseElementType) {

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_Edge == baseElementType) {

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_BranchEdge == baseElementType) {

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is 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.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.DeleteCommand;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+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.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+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.notation.View;
+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
+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.edit.commands.AbstractionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;
+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.ComponentRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;
+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.InterfaceRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;
+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;
+
+/**
+ * @generated
+ */
+public class DefaultNamedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	public DefaultNamedElementItemSemanticEditPolicy() {
+		super(UMLElementTypes.NamedElement_DefaultShape);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected Command getDestroyElementCommand(DestroyElementRequest req) {
+		View view = (View) getHost().getModel();
+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);
+		cmd.setTransactionNestingEnabled(true);
+		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$
+		if (annotation == null) {
+			// there are indirectly referenced children, need extra commands: false
+			addDestroyShortcutsCommand(cmd, view);
+			// delete host element
+			List<EObject> todestroy = new ArrayList<>();
+			todestroy.add(req.getElementToDestroy());
+			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));
+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));
+		} else {
+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));
+		}
+		return getGEFWrapper(cmd.reduce());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
+		return command != null ? command : super.getCreateRelationshipCommand(req);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {
+		IElementType requestElementType = req.getElementType();
+		if (requestElementType == null) {
+			return null;
+		}
+		IElementType baseElementType = requestElementType;
+
+		if (UMLElementTypes.Usage_Edge == baseElementType) {
+			return getGEFWrapper(new UsageCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.InterfaceRealization_Edge == baseElementType) {
+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Substitution_Edge == baseElementType) {
+			return getGEFWrapper(new SubstitutionCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Manifestation_Edge == baseElementType) {
+			return getGEFWrapper(new ManifestationCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.ComponentRealization_Edge == baseElementType) {
+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Abstraction_Edge == baseElementType) {
+			return getGEFWrapper(new AbstractionCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {
+			return null;
+		}
+		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {
+			return null;
+		}
+		if (UMLElementTypes.Dependency_Edge == baseElementType) {
+			return getGEFWrapper(new DependencyCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Dependency_BranchEdge == baseElementType) {
+			return getGEFWrapper(new DependencyBranchCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {
+		IElementType requestElementType = req.getElementType();
+		if (requestElementType == null) {
+			return null;
+		}
+		IElementType baseElementType = requestElementType;
+
+		if (UMLElementTypes.Usage_Edge == baseElementType) {
+			return getGEFWrapper(new UsageCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.InterfaceRealization_Edge == baseElementType) {
+			return null;
+		}
+		if (UMLElementTypes.Substitution_Edge == baseElementType) {
+			return getGEFWrapper(new SubstitutionCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Manifestation_Edge == baseElementType) {
+			return getGEFWrapper(new ManifestationCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.ComponentRealization_Edge == baseElementType) {
+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Abstraction_Edge == baseElementType) {
+			return getGEFWrapper(new AbstractionCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {
+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {
+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Dependency_Edge == baseElementType) {
+			return getGEFWrapper(new DependencyCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Dependency_BranchEdge == baseElementType) {
+			return getGEFWrapper(new DependencyBranchCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		return null;
+	}
+
+	/**
+	 * Returns command to reorient EClass based link. New link target or source
+	 * should be the domain model element associated with this node.
+	 *
+	 * @generated
+	 */
+	@Override
+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
+		switch (getVisualID(req)) {
+		case UsageEditPart.VISUAL_ID:
+		case InterfaceRealizationEditPart.VISUAL_ID:
+		case SubstitutionEditPart.VISUAL_ID:
+		case ManifestationEditPart.VISUAL_ID:
+		case ComponentRealizationEditPart.VISUAL_ID:
+		case AbstractionEditPart.VISUAL_ID:
+		case DependencyEditPart.VISUAL_ID:
+		case DependencyBranchEditPart.VISUAL_ID:
+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
+			if (provider == null) {
+				return UnexecutableCommand.INSTANCE;
+			}
+			// Retrieve re-orient command from the Element Edit service
+			ICommand reorientCommand = provider.getEditCommand(req);
+			if (reorientCommand == null) {
+				return UnexecutableCommand.INSTANCE;
+			}
+			return getGEFWrapper(reorientCommand.reduce());
+		}
+		return super.getReorientRelationshipCommand(req);
+	}
+
+	/**
+	 * Returns command to reorient EReference based link. New link target or source
+	 * should be the domain model element associated with this node.
+	 *
+	 * @generated
+	 */
+	@Override
+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
+		switch (getVisualID(req)) {
+		case CommentAnnotatedElementEditPart.VISUAL_ID:
+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
+		case ConstraintConstrainedElementEditPart.VISUAL_ID:
+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+		}
+		return super.getReorientReferenceRelationshipCommand(req);
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java
index d332990af90..e486b2236a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java
@@ -1,238 +1,238 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is 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.emf.ecore.EObject;

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

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-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.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-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.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-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.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-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.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

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

-

-/**

- * @generated

- */

-public class DependencyBranchItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DependencyBranchItemSemanticEditPolicy() {

-		super(UMLElementTypes.Dependency_BranchEdge);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		if (UMLElementTypes.Usage_Edge == baseElementType) {

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_Edge == baseElementType) {

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_Edge == baseElementType) {

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_Edge == baseElementType) {

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_Edge == baseElementType) {

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_Edge == baseElementType) {

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_Edge == baseElementType) {

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_BranchEdge == baseElementType) {

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-

-		if (UMLElementTypes.Usage_Edge == baseElementType) {

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_Edge == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_Edge == baseElementType) {

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_Edge == baseElementType) {

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_Edge == baseElementType) {

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_Edge == baseElementType) {

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_Edge == baseElementType) {

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_BranchEdge == baseElementType) {

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is 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.emf.ecore.EObject;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+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.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+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.edit.commands.AbstractionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;
+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.ComponentRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;
+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.InterfaceRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;
+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;
+
+/**
+ * @generated
+ */
+public class DependencyBranchItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	public DependencyBranchItemSemanticEditPolicy() {
+		super(UMLElementTypes.Dependency_BranchEdge);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected Command getDestroyElementCommand(DestroyElementRequest req) {
+		EObject selectedEObject = req.getElementToDestroy();
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
+		if (provider != null) {
+			// Retrieve delete command from the Element Edit service
+			ICommand deleteCommand = provider.getEditCommand(req);
+
+			if (deleteCommand != null) {
+				return new ICommandProxy(deleteCommand);
+			}
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
+		return command != null ? command : super.getCreateRelationshipCommand(req);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {
+		IElementType requestElementType = req.getElementType();
+		if (requestElementType == null) {
+			return null;
+		}
+		IElementType baseElementType = requestElementType;
+		if (UMLElementTypes.Usage_Edge == baseElementType) {
+			return getGEFWrapper(new UsageCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.InterfaceRealization_Edge == baseElementType) {
+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Substitution_Edge == baseElementType) {
+			return getGEFWrapper(new SubstitutionCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Manifestation_Edge == baseElementType) {
+			return getGEFWrapper(new ManifestationCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.ComponentRealization_Edge == baseElementType) {
+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Abstraction_Edge == baseElementType) {
+			return getGEFWrapper(new AbstractionCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {
+			return null;
+		}
+		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {
+			return null;
+		}
+		if (UMLElementTypes.Dependency_Edge == baseElementType) {
+			return getGEFWrapper(new DependencyCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Dependency_BranchEdge == baseElementType) {
+			return getGEFWrapper(new DependencyBranchCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {
+		IElementType requestElementType = req.getElementType();
+		if (requestElementType == null) {
+			return null;
+		}
+		IElementType baseElementType = requestElementType;
+
+		if (UMLElementTypes.Usage_Edge == baseElementType) {
+			return getGEFWrapper(new UsageCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.InterfaceRealization_Edge == baseElementType) {
+			return null;
+		}
+		if (UMLElementTypes.Substitution_Edge == baseElementType) {
+			return getGEFWrapper(new SubstitutionCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Manifestation_Edge == baseElementType) {
+			return getGEFWrapper(new ManifestationCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.ComponentRealization_Edge == baseElementType) {
+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Abstraction_Edge == baseElementType) {
+			return getGEFWrapper(new AbstractionCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {
+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {
+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Dependency_Edge == baseElementType) {
+			return getGEFWrapper(new DependencyCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Dependency_BranchEdge == baseElementType) {
+			return getGEFWrapper(new DependencyBranchCreateCommand(req,
+					req.getSource(), req.getTarget()));
+		}
+		return null;
+	}
+
+	/**
+	 * Returns command to reorient EClass based link. New link target or source
+	 * should be the domain model element associated with this node.
+	 *
+	 * @generated
+	 */
+	@Override
+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
+		switch (getVisualID(req)) {
+		case UsageEditPart.VISUAL_ID:
+		case InterfaceRealizationEditPart.VISUAL_ID:
+		case SubstitutionEditPart.VISUAL_ID:
+		case ManifestationEditPart.VISUAL_ID:
+		case ComponentRealizationEditPart.VISUAL_ID:
+		case AbstractionEditPart.VISUAL_ID:
+		case DependencyEditPart.VISUAL_ID:
+		case DependencyBranchEditPart.VISUAL_ID:
+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
+			if (provider == null) {
+				return UnexecutableCommand.INSTANCE;
+			}
+			// Retrieve re-orient command from the Element Edit service
+			ICommand reorientCommand = provider.getEditCommand(req);
+			if (reorientCommand == null) {
+				return UnexecutableCommand.INSTANCE;
+			}
+			return getGEFWrapper(reorientCommand.reduce());
+		}
+		return super.getReorientRelationshipCommand(req);
+	}
+
+	/**
+	 * Returns command to reorient EReference based link. New link target or source
+	 * should be the domain model element associated with this node.
+	 *
+	 * @generated
+	 */
+	@Override
+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
+		switch (getVisualID(req)) {
+		case CommentAnnotatedElementEditPart.VISUAL_ID:
+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
+		case ConstraintConstrainedElementEditPart.VISUAL_ID:
+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+		}
+		return super.getReorientReferenceRelationshipCommand(req);
+	}
+}
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 8e07e404bfd..a1d6e775910 100755
--- 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,657 +1,657 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.papyrus.infra.gmfdiag.tooling.runtime.edit.helpers.GeneratedEditHelperBase;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.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;

-	}

-

-	/**

-	 * @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() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$

-				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", UMLPackage.eINSTANCE.getNamedElement()); //$NON-NLS-1$

-					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", UMLPackage.eINSTANCE.getNamedElement()); //$NON-NLS-1$

-					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", UMLPackage.eINSTANCE.getInterface()); //$NON-NLS-1$

-					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", UMLPackage.eINSTANCE.getNamedElement()); //$NON-NLS-1$

-					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.papyrus.infra.gmfdiag.tooling.runtime.edit.helpers.GeneratedEditHelperBase;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.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;
+	}
+
+	/**
+	 * @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() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$
+				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", UMLPackage.eINSTANCE.getNamedElement()); //$NON-NLS-1$
+					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", UMLPackage.eINSTANCE.getNamedElement()); //$NON-NLS-1$
+					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", UMLPackage.eINSTANCE.getInterface()); //$NON-NLS-1$
+					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", UMLPackage.eINSTANCE.getNamedElement()); //$NON-NLS-1$
+					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 5e9413de68a..c183424bdc3 100755
--- 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,244 +1,244 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.papyrus.infra.gmfdiag.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.papyrus.infra.gmfdiag.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 239aa59161e..94d10961acf 100755
--- 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,227 +1,227 @@
-/**

- * Copyright (c) 2014 CEA LIST.

-  *

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

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

-  * which accompanies this distribution, and is 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.papyrus.infra.gmfdiag.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.papyrus.infra.gmfdiag.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;
+	}
+
+}