350028: Use Case diagrams - Actors - Misplaced name label

https://bugs.eclipse.org/bugs/show_bug.cgi?id=350028

16 files changed, 1785 insertions, 65 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/ElementToStereotypedShape.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/ElementToStereotypedShape.java
index 9c3c9446e49..6229dacc3dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/ElementToStereotypedShape.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/ElementToStereotypedShape.java
@@ -48,20 +48,15 @@ public class ElementToStereotypedShape extends RecordingCommand {
 

 	@Override

 	protected void doExecute() {

-

 		//creation of the node

 		UMLViewProvider umlViewProvider = new UMLViewProvider();

 		Node packageview = umlViewProvider.createNamedElement_2023(elementEditPart.resolveSemanticElement(), (View)elementEditPart.getNotationView().eContainer(), -1, true, elementEditPart.getDiagramPreferencesHint());

 		packageview.setLayoutConstraint(((Node)elementEditPart.getNotationView()).getLayoutConstraint());

-

 		//copy of all eannotations

 		Iterator<EAnnotation> iter = elementEditPart.getNotationView().getEAnnotations().iterator();

 		while(iter.hasNext()) {

 			EAnnotation annotation = EcoreUtil.copy(iter.next());

 			packageview.getEAnnotations().add(annotation);

-

 		}

-

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/StickMan.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/StickMan.java
index 00cfa7c669a..d341d05d663 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/StickMan.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/StickMan.java
@@ -24,7 +24,7 @@ import org.eclipse.swt.graphics.Image;
  * The Class StickMan. This class comes from org.eclipse.uml2.diagram.usecase.draw2d provided by

  * Eclipse.org

  */

-public class StickMan extends ShadowShape implements IPapyrusNodeNamedElementFigure{

+public class StickMan extends ShadowShape implements IPapyrusNodeNamedElementFigure {

 

 	private static final float BASE_W = 31 - 1;

 

@@ -141,12 +141,10 @@ public class StickMan extends ShadowShape implements IPapyrusNodeNamedElementFig
 

 	public void setStereotypePropertiesInBrace(String stereotypeProperties) {

 		// TODO Auto-generated method stub

-		

 	}

 

 	public void setStereotypePropertiesInCompartment(String stereotypeProperties) {

 		// TODO Auto-generated method stub

-		

 	}

 

 	public Label getStereotypesLabel() {

@@ -156,12 +154,10 @@ public class StickMan extends ShadowShape implements IPapyrusNodeNamedElementFig
 

 	public void setStereotypeDisplay(String stereotypes, Image image) {

 		// TODO Auto-generated method stub

-		

 	}

 

 	public void setQualifiedName(String qualifiedName) {

 		// TODO Auto-generated method stub

-		

 	}

 

 	public Label getQualifiedNameLabel() {

@@ -176,7 +172,6 @@ public class StickMan extends ShadowShape implements IPapyrusNodeNamedElementFig
 

 	public void setDepth(int depth) {

 		// TODO Auto-generated method stub

-		

 	}

 

 	public WrappingLabel getNameLabel() {

@@ -186,6 +181,5 @@ public class StickMan extends ShadowShape implements IPapyrusNodeNamedElementFig
 

 	public void setNameLabelIcon(boolean displayNameLabelIcon) {

 		// TODO Auto-generated method stub

-		

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CustomDefaultNamedElementItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CustomDefaultNamedElementItemSemanticEditPolicyTN.java
index 5e9717af965..2649ec592db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CustomDefaultNamedElementItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CustomDefaultNamedElementItemSemanticEditPolicyTN.java
@@ -25,14 +25,14 @@ import org.eclipse.uml2.uml.UseCase;
 

 /**

  * this class allow creation of association on default named element if this element is a class

- *

+ * 

  */

 public class CustomDefaultNamedElementItemSemanticEditPolicyTN extends DefaultNamedElementItemSemanticEditPolicyTN {

 

 	@Override

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		EObject eobject=((GraphicalEditPart)getHost()).resolveSemanticElement();

-		if((eobject instanceof Class)||(eobject instanceof Actor)||(eobject instanceof UseCase)) {

+		EObject eobject = ((GraphicalEditPart)getHost()).resolveSemanticElement();

+		if((eobject instanceof Class) || (eobject instanceof Actor) || (eobject instanceof UseCase)) {

 			if(UMLElementTypes.Association_4011 == req.getElementType()) {

 				return getGEFWrapper(new AssociationCreateCommand(req, req.getSource(), req.getTarget()));

 			}

@@ -42,8 +42,8 @@ public class CustomDefaultNamedElementItemSemanticEditPolicyTN extends DefaultNa
 

 	@Override

 	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		EObject eobject=((GraphicalEditPart)getHost()).resolveSemanticElement();

-		if((eobject instanceof Class)||(eobject instanceof Actor)||(eobject instanceof UseCase)) {

+		EObject eobject = ((GraphicalEditPart)getHost()).resolveSemanticElement();

+		if((eobject instanceof Class) || (eobject instanceof Actor) || (eobject instanceof UseCase)) {

 			if(UMLElementTypes.Association_4011 == req.getElementType()) {

 				return getGEFWrapper(new AssociationCreateCommand(req, req.getSource(), req.getTarget()));

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java
new file mode 100644
index 00000000000..bf2df8d280c
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java
@@ -0,0 +1,66 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *

+ *    

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

+

+import java.util.Collections;

+import java.util.List;

+

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

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

+import org.eclipse.gef.GraphicalEditPart;

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

+import org.eclipse.gef.handles.MoveHandle;

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

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

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;

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

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

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

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

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

+

+/**

+ * This policy provides the selection handles, feedback and move command for

+ * external node label.

+ * The expected behavior is to provide an external label that can freely move and with a link feedback

+ * towards its parent figure during the move.

+ */

+public class ExternalLabelPrimaryDragRoleEditPolicy extends NonResizableLabelEditPolicy {

+

+	@Override

+	protected List<?> createSelectionHandles() {

+		MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

+		mh.setBorder(null);

+		return Collections.singletonList(mh);

+	}

+

+	@Override

+	protected Command getMoveCommand(ChangeBoundsRequest request) {

+		LabelEditPart editPart = (LabelEditPart)getHost();

+		// FeedBack - Port + Delta

+		Rectangle updatedRect = new Rectangle();

+		PrecisionRectangle initialRect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());

+		updatedRect = initialRect.getTranslated(getHostFigure().getParent().getBounds().getLocation().getNegated());

+		updatedRect = updatedRect.getTranslated(request.getMoveDelta());

+		// translate the feedback figure

+		PrecisionRectangle rect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());

+		getHostFigure().translateToAbsolute(rect);

+		rect.translate(request.getMoveDelta());

+		rect.resize(request.getSizeDelta());

+		getHostFigure().translateToRelative(rect);

+		ICommand moveCommand = new SetBoundsCommand(editPart.getEditingDomain(), DiagramUIMessages.MoveLabelCommand_Label_Location, new EObjectAdapter((View)editPart.getModel()), updatedRect);

+		return new ICommandProxy(moveCommand);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ExternalNodeActorLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ExternalNodeActorLayoutEditPolicy.java
new file mode 100644
index 00000000000..4afd5e4442d
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ExternalNodeActorLayoutEditPolicy.java
@@ -0,0 +1,62 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *

+ *    

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

+

+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.notation.View;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorQualifiedNameEditPartTN;

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

+

+/**

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

+ * In particular it installs {@link ExternalLabelPrimaryDragRoleEditPolicy} on

+ * children that are external label.

+ * The code generated by GMF can be found in {@link PortEditPart#createLayoutEditPolicy()}.

+ */

+public class ExternalNodeActorLayoutEditPolicy extends LayoutEditPolicy {

+

+	@Override

+	protected EditPolicy createChildEditPolicy(EditPart child) {

+		View childView = (View)child.getModel();

+		switch(UMLVisualIDRegistry.getVisualID(childView)) {

+		case ActorNameEditPartTN.VISUAL_ID:

+		case ActorAppliedStereotypeEditPartTN.VISUAL_ID:

+		case ActorQualifiedNameEditPartTN.VISUAL_ID:

+			return new ExternalLabelPrimaryDragRoleEditPolicy();

+		}

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

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseChangeStereotypedShapeEditpolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseChangeStereotypedShapeEditpolicy.java
index cc97a1bc4dc..da3b673a340 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseChangeStereotypedShapeEditpolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseChangeStereotypedShapeEditpolicy.java
@@ -41,12 +41,10 @@ public class UseCaseChangeStereotypedShapeEditpolicy extends ChangeStereotypedSh
 			((IGraphicalEditPart)getHost()).getEditingDomain().runExclusive(new Runnable() {

 

 				public void run() {

-

 					Display.getCurrent().asyncExec(new Runnable() {

 

 						public void run() {

 							if(part instanceof GraphicalEditPart) {

-

 								GraphicalEditPart gmfpart = (GraphicalEditPart)part;

 								ElementToStereotypedShape command = new ElementToStereotypedShape(gmfpart.getEditingDomain(), gmfpart);

 								gmfpart.getEditingDomain().getCommandStack().execute(command);

@@ -54,7 +52,6 @@ public class UseCaseChangeStereotypedShapeEditpolicy extends ChangeStereotypedSh
 								Command deleteCommand = gmfpart.getCommand(deleteViewRequest);

 								gmfpart.getDiagramEditDomain().getDiagramCommandStack().execute(deleteCommand);

 							}

-

 						}

 					});

 				}

@@ -70,12 +67,10 @@ public class UseCaseChangeStereotypedShapeEditpolicy extends ChangeStereotypedSh
 			((IGraphicalEditPart)getHost()).getEditingDomain().runExclusive(new Runnable() {

 

 				public void run() {

-

 					Display.getCurrent().asyncExec(new Runnable() {

 

 						public void run() {

 							if(part instanceof GraphicalEditPart) {

-

 								GraphicalEditPart gmfpart = (GraphicalEditPart)part;

 								DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

 								ArrayList<EObject> list = new ArrayList<EObject>();

@@ -88,7 +83,6 @@ public class UseCaseChangeStereotypedShapeEditpolicy extends ChangeStereotypedSh
 								Command deleteCommand = gmfpart.getCommand(deleteViewRequest);

 								gmfpart.getDiagramEditDomain().getDiagramCommandStack().execute(deleteCommand);

 							}

-

 						}

 					});

 				}

@@ -97,5 +91,4 @@ public class UseCaseChangeStereotypedShapeEditpolicy extends ChangeStereotypedSh
 			e.printStackTrace();

 		}

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen
index 82b185e29e4..aaff2c53aa9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen
@@ -484,6 +484,10 @@
             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY"

             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseChangeStereotypedShapeEditpolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ExternalNodeActorLayoutEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>

@@ -512,7 +516,12 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="20"

+                y="60"/>

+          </viewmap>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.0"

@@ -531,7 +540,12 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="20"

+                y="100"/>

+          </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

               key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

@@ -539,6 +553,26 @@
           <modelFacet

               parser="/0/@labelParsers/@implementations.2"/>

         </labels>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="6041"

+            editPartClassName="ActorQualifiedNameInCEditPart"

+            itemSemanticEditPolicyClassName="ActorQualifiedNameInCItemSemanticEditPolicy">

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.QualifiedNameWrappingLabelFigure">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="20"

+                y="80"/>

+          </viewmap>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayExternalNodeEditPolicy"/>

+          <modelFacet

+              parser="/0/@labelParsers/@implementations.1"/>

+        </labels>

       </childNodes>

       <childNodes

           visualID="3010"

@@ -651,6 +685,10 @@
             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY"

             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseChangeStereotypedShapeEditpolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ExternalNodeActorLayoutEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>

@@ -679,7 +717,12 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="20"

+                y="60"/>

+          </viewmap>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.0"

@@ -698,7 +741,12 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="20"

+                y="100"/>

+          </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

               key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

@@ -706,6 +754,26 @@
           <modelFacet

               parser="/0/@labelParsers/@implementations.2"/>

         </labels>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="6040"

+            editPartClassName="ActorQualifiedNameInPEditPart"

+            itemSemanticEditPolicyClassName="ActorQualifiedNameInPItemSemanticEditPolicy">

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.QualifiedNameWrappingLabelFigure">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="20"

+                y="80"/>

+          </viewmap>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayExternalNodeEditPolicy"/>

+          <modelFacet

+              parser="/0/@labelParsers/@implementations.1"/>

+        </labels>

       </childNodes>

       <childNodes

           visualID="3012"

@@ -988,6 +1056,10 @@
             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY"

             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseChangeStereotypedShapeEditpolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ExternalNodeActorLayoutEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>

@@ -1016,7 +1088,12 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="20"

+                y="60"/>

+          </viewmap>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.0"

@@ -1035,7 +1112,12 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="20"

+                y="100"/>

+          </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

               key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

@@ -1050,7 +1132,12 @@
             itemSemanticEditPolicyClassName="ActorQualifiedNameLabelItemSemanticEditPolicyTN">

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.QualifiedNameWrappingLabelFigure"/>

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.QualifiedNameWrappingLabelFigure">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="20"

+                y="80"/>

+          </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

               key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

@@ -3080,7 +3167,7 @@
           uses="/0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@childNodes.0/@labelModelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labelModelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labels.0/@modelFacet /0/@diagram/@childNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.7/@labels.0/@modelFacet /0/@diagram/@links.8/@labels.0/@modelFacet /0/@diagram/@links.9/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.10/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.9/@labels.0/@modelFacet"/>

       <implementations

           xsi:type="gmfgen:ExternalParser"

-          uses="/0/@diagram/@links.0/@labels.0/@modelFacet /0/@diagram/@links.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.2/@modelFacet"/>

+          uses="/0/@diagram/@links.0/@labels.0/@modelFacet /0/@diagram/@links.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.2/@modelFacet /0/@diagram/@childNodes.6/@labels.2/@modelFacet /0/@diagram/@childNodes.8/@labels.2/@modelFacet"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.1/@modelFacet /0/@diagram/@childNodes.8/@labels.1/@modelFacet /0/@diagram/@links.0/@labels.1/@modelFacet /0/@diagram/@links.1/@labels.1/@modelFacet /0/@diagram/@links.2/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.7/@labels.1/@modelFacet /0/@diagram/@links.8/@labels.1/@modelFacet /0/@diagram/@links.9/@labels.1/@modelFacet /0/@diagram/@links.11/@labels.0/@modelFacet"

@@ -3195,5 +3282,10 @@
         genView="/0/@diagram/@topLevelNodes.9"

         name="AbstractShapeEditPart"

         superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShapeEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:SpecificLocatorExternalLabel"

+        comment="External node label locator"

+        classpath="org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator"

+        genExternalNodeLabel="/0/@diagram/@topLevelNodes.0/@labels.0 /0/@diagram/@topLevelNodes.0/@labels.2 /0/@diagram/@topLevelNodes.0/@labels.1 /0/@diagram/@childNodes.6/@labels.0 /0/@diagram/@childNodes.8/@labels.0 /0/@diagram/@childNodes.6/@labels.1 /0/@diagram/@childNodes.8/@labels.1 /0/@diagram/@childNodes.6/@labels.2 /0/@diagram/@childNodes.8/@labels.2"/>

   </papyrusgmfgenextension:PapyrusExtensionRootNode>

 </xmi:XMI>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
index ba22fe5379c..e5094e0d8df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
@@ -202,7 +202,7 @@
             <method name="getType()" value="4008,4009,4010,4011,4012,4013,4014,4015,4016,4017,4018,4019"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
-            <method name="getType()" value="5014,6029,6037,5015,5016,5017,5019,5025,5026,5027,6039,6038,5032,5018,5030,5028,5029,5031,6027,5020,5021,6028,5022,5023,5024"/>
+            <method name="getType()" value="5014,6029,6037,5015,5016,5017,5019,5025,5026,5027,6039,6038,5032,5018,5030,5028,5029,5031,6027,6041,5020,5021,6028,6040,5022,5023,5024"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
             <method name="getType()" value="7009,7010,7011,7012,7017,7014,7015,7016,7013"/>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
index afa48a46e61..f1dd122b3be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
@@ -19,10 +19,8 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

 import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

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

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.EditPolicy;

@@ -38,7 +36,7 @@ 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.BorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

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

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

@@ -52,8 +50,10 @@ import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHel
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

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

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.usecase.draw2d.StickMan;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ActorItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ExternalNodeActorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

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

@@ -96,6 +96,7 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());

 		installEditPolicy(ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY, new UseCaseChangeStereotypedShapeEditpolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ExternalNodeActorLayoutEditPolicy());

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

 	}

@@ -157,9 +158,14 @@ public class ActorEditPartTN extends AbstractBorderedShapeEditPart {
 	 * @generated

 	 */

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if(borderItemEditPart instanceof ActorNameEditPartTN || borderItemEditPart instanceof ActorAppliedStereotypeEditPartTN || borderItemEditPart instanceof ActorQualifiedNameEditPartTN) {

-			BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH);

-			locator.setBorderItemOffset(new Dimension(-20, -20));

+		if(borderItemEditPart instanceof ActorNameEditPartTN) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if(borderItemEditPart instanceof ActorAppliedStereotypeEditPartTN) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if(borderItemEditPart instanceof ActorQualifiedNameEditPartTN) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

 		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
index 770981fc615..690d926bb7a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
@@ -19,10 +19,8 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

 import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

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

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.EditPolicy;

@@ -38,7 +36,7 @@ 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.BorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

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

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

@@ -52,8 +50,10 @@ import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHel
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

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

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.usecase.draw2d.StickMan;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ActorInComponentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ExternalNodeActorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

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

@@ -96,6 +96,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());

 		installEditPolicy(ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY, new UseCaseChangeStereotypedShapeEditpolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ExternalNodeActorLayoutEditPolicy());

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

 	}

@@ -111,6 +112,7 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ActorInComponentNameEditPart.VISUAL_ID:

 				case ActorInComponentAppliedStereotypeEditPart.VISUAL_ID:

+				case ActorQualifiedNameInCEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						protected List createSelectionHandles() {

@@ -156,9 +158,14 @@ public class ActorInComponentEditPart extends AbstractBorderedShapeEditPart {
 	 * @generated

 	 */

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if(borderItemEditPart instanceof ActorInComponentNameEditPart || borderItemEditPart instanceof ActorInComponentAppliedStereotypeEditPart) {

-			BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH);

-			locator.setBorderItemOffset(new Dimension(-20, -20));

+		if(borderItemEditPart instanceof ActorInComponentNameEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if(borderItemEditPart instanceof ActorInComponentAppliedStereotypeEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if(borderItemEditPart instanceof ActorQualifiedNameInCEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

 		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
index 068aa177ce8..3e7a26c0f5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
@@ -19,10 +19,8 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

 import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

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

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.EditPolicy;

@@ -38,7 +36,7 @@ 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.BorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

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

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

@@ -52,8 +50,10 @@ import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHel
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

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

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.usecase.draw2d.StickMan;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ActorInPackageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ExternalNodeActorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

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

@@ -96,6 +96,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());

 		installEditPolicy(ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY, new UseCaseChangeStereotypedShapeEditpolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ExternalNodeActorLayoutEditPolicy());

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

 	}

@@ -111,6 +112,7 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ActorInPackageNameEditPart.VISUAL_ID:

 				case ActorInPackageAppliedStereotypeEditPart.VISUAL_ID:

+				case ActorQualifiedNameInPEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						protected List createSelectionHandles() {

@@ -156,9 +158,14 @@ public class ActorInPackageEditPart extends AbstractBorderedShapeEditPart {
 	 * @generated

 	 */

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if(borderItemEditPart instanceof ActorInPackageNameEditPart || borderItemEditPart instanceof ActorInPackageAppliedStereotypeEditPart) {

-			BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH);

-			locator.setBorderItemOffset(new Dimension(-20, -20));

+		if(borderItemEditPart instanceof ActorInPackageNameEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if(borderItemEditPart instanceof ActorInPackageAppliedStereotypeEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if(borderItemEditPart instanceof ActorQualifiedNameInPEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

 		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorQualifiedNameInCEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorQualifiedNameInCEditPart.java
new file mode 100644
index 00000000000..ea894ec8bec
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorQualifiedNameInCEditPart.java
@@ -0,0 +1,737 @@
+package org.eclipse.papyrus.uml.diagram.usecase.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.ParserEditStatus;

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

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

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

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

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

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

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

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

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

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

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

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.extensionpoints.editors.configuration.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.IMaskManagedLabelEditPolicy;

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

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

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

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

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

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

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

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

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

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * @generated

+ */

+public class ActorQualifiedNameInCEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6041;

+

+	/**

+	 * @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.usecase.edit.parts.ActorQualifiedNameInCEditPart.VISUAL_ID), new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ActorQualifiedNameInCEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

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

+	}

+

+	/**

+	 * @generated

+	 */

+	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

+	 */

+	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

+	 */

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

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

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

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

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

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

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

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorQualifiedNameInCEditPart.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() {

+		getManager().show();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

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

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

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

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				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(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)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:

+			// initialize the direct edit manager

+			try {

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

+

+					public void run() {

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

+							if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof 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();

+			}

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

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

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

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

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

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

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

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

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

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

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

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

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

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

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

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

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

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

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

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

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

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

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

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

+	 * 

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

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

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

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

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

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

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

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

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

+			configuration = null;

+		}

+	}

+

+	/**

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

+	 * 

+	 * @param theRequest

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

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

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

+

+				public void run() {

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

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

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

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

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

+			refreshUnderline();

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

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

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

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

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

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new QualifiedNameWrappingLabelFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorQualifiedNameInPEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorQualifiedNameInPEditPart.java
new file mode 100644
index 00000000000..0b7c72cea74
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorQualifiedNameInPEditPart.java
@@ -0,0 +1,737 @@
+package org.eclipse.papyrus.uml.diagram.usecase.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.ParserEditStatus;

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

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

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

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

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

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

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

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

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

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

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

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.extensionpoints.editors.configuration.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.IMaskManagedLabelEditPolicy;

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

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

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

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

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

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

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

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

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

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * @generated

+ */

+public class ActorQualifiedNameInPEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6040;

+

+	/**

+	 * @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.usecase.edit.parts.ActorQualifiedNameInPEditPart.VISUAL_ID), new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ActorQualifiedNameInPEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

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

+	}

+

+	/**

+	 * @generated

+	 */

+	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

+	 */

+	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

+	 */

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

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

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

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

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

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

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

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorQualifiedNameInPEditPart.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() {

+		getManager().show();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

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

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

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

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				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(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)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:

+			// initialize the direct edit manager

+			try {

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

+

+					public void run() {

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

+							if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof 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();

+			}

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

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

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

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

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

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

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

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

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

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

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

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

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

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

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

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

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

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

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

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

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

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

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

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

+	 * 

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

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

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

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

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

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

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

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

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

+			configuration = null;

+		}

+	}

+

+	/**

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

+	 * 

+	 * @param theRequest

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

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

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

+

+				public void run() {

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

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

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

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

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

+			refreshUnderline();

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

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

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

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

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

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new QualifiedNameWrappingLabelFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UMLEditPartFactory.java
index 5686a99d6e0..97e3b440ee3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UMLEditPartFactory.java
@@ -117,6 +117,8 @@ public class UMLEditPartFactory implements EditPartFactory {
 				return new ActorInComponentNameEditPart(view);

 			case ActorInComponentAppliedStereotypeEditPart.VISUAL_ID:

 				return new ActorInComponentAppliedStereotypeEditPart(view);

+			case ActorQualifiedNameInCEditPart.VISUAL_ID:

+				return new ActorQualifiedNameInCEditPart(view);

 			case ConstraintInPackageEditPart.VISUAL_ID:

 				return new ConstraintInPackageEditPart(view);

 			case ConstraintInPackageNameEditPart.VISUAL_ID:

@@ -127,6 +129,8 @@ public class UMLEditPartFactory implements EditPartFactory {
 				return new ActorInPackageNameEditPart(view);

 			case ActorInPackageAppliedStereotypeEditPart.VISUAL_ID:

 				return new ActorInPackageAppliedStereotypeEditPart(view);

+			case ActorQualifiedNameInPEditPart.VISUAL_ID:

+				return new ActorQualifiedNameInPEditPart(view);

 			case UseCaseInPackageEditPart.VISUAL_ID:

 				return new UseCaseInPackageEditPart(view);

 			case UseCaseInPackageNameEditPart.VISUAL_ID:

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLVisualIDRegistry.java
index a42d4835663..5aa25968104 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLVisualIDRegistry.java
@@ -35,6 +35,8 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageNameEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorNameEditPartTN;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorQualifiedNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorQualifiedNameInCEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorQualifiedNameInPEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeAbstractionEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeUsageEditPart;

@@ -517,6 +519,9 @@ public class UMLVisualIDRegistry {
 			if(ActorInComponentAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

+			if(ActorQualifiedNameInCEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

 			break;

 		case ConstraintInPackageEditPart.VISUAL_ID:

 			if(ConstraintInPackageNameEditPart.VISUAL_ID == nodeVisualID) {

@@ -530,6 +535,9 @@ public class UMLVisualIDRegistry {
 			if(ActorInPackageAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

+			if(ActorQualifiedNameInPEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

 			break;

 		case UseCaseInPackageEditPart.VISUAL_ID:

 			if(UseCaseInPackageNameEditPart.VISUAL_ID == nodeVisualID) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
index eb2afcdb4bf..769c73b3fa0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
@@ -69,6 +69,8 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageNameEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorNameEditPartTN;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorQualifiedNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorQualifiedNameInCEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorQualifiedNameInPEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeAbstractionEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeUsageEditPart;

@@ -430,18 +432,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Node label5014 = createLabel(node, UMLVisualIDRegistry.getType(ActorNameEditPartTN.VISUAL_ID));

 		label5014.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location5014 = (Location)label5014.getLayoutConstraint();

-		location5014.setX(0);

-		location5014.setY(5);

+		location5014.setX(20);

+		location5014.setY(60);

 		Node label6029 = createLabel(node, UMLVisualIDRegistry.getType(ActorAppliedStereotypeEditPartTN.VISUAL_ID));

 		label6029.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6029 = (Location)label6029.getLayoutConstraint();

-		location6029.setX(0);

-		location6029.setY(5);

+		location6029.setX(20);

+		location6029.setY(100);

 		Node label6037 = createLabel(node, UMLVisualIDRegistry.getType(ActorQualifiedNameEditPartTN.VISUAL_ID));

 		label6037.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6037 = (Location)label6037.getLayoutConstraint();

-		location6037.setX(0);

-		location6037.setY(5);

+		location6037.setX(20);

+		location6037.setY(80);

 		return node;

 	}

 

@@ -779,13 +781,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Node label5031 = createLabel(node, UMLVisualIDRegistry.getType(ActorInComponentNameEditPart.VISUAL_ID));

 		label5031.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location5031 = (Location)label5031.getLayoutConstraint();

-		location5031.setX(0);

-		location5031.setY(5);

+		location5031.setX(20);

+		location5031.setY(60);

 		Node label6027 = createLabel(node, UMLVisualIDRegistry.getType(ActorInComponentAppliedStereotypeEditPart.VISUAL_ID));

 		label6027.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6027 = (Location)label6027.getLayoutConstraint();

-		location6027.setX(0);

-		location6027.setY(5);

+		location6027.setX(20);

+		location6027.setY(100);

+		Node label6041 = createLabel(node, UMLVisualIDRegistry.getType(ActorQualifiedNameInCEditPart.VISUAL_ID));

+		label6041.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6041 = (Location)label6041.getLayoutConstraint();

+		location6041.setX(20);

+		location6041.setY(80);

 		return node;

 	}

 

@@ -824,13 +831,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Node label5021 = createLabel(node, UMLVisualIDRegistry.getType(ActorInPackageNameEditPart.VISUAL_ID));

 		label5021.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location5021 = (Location)label5021.getLayoutConstraint();

-		location5021.setX(0);

-		location5021.setY(5);

+		location5021.setX(20);

+		location5021.setY(60);

 		Node label6028 = createLabel(node, UMLVisualIDRegistry.getType(ActorInPackageAppliedStereotypeEditPart.VISUAL_ID));

 		label6028.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6028 = (Location)label6028.getLayoutConstraint();

-		location6028.setX(0);

-		location6028.setY(5);

+		location6028.setX(20);

+		location6028.setY(100);

+		Node label6040 = createLabel(node, UMLVisualIDRegistry.getType(ActorQualifiedNameInPEditPart.VISUAL_ID));

+		label6040.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6040 = (Location)label6040.getLayoutConstraint();

+		location6040.setX(20);

+		location6040.setY(80);

 		return node;

 	}