453082: [Diagram] Use case diagram shapes shall be refactored

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

- Refactor ComponentInPackageEditPart. Other edit parts will be done
when the creation will be possible.

Change-Id: Ie0cdde5882b9bdcd088cacb950f67947f54cd6ca
Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>

15 files changed, 1051 insertions, 55 deletions

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 9f35b4c43d3..746eb7f41bb 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
@@ -910,7 +910,7 @@
             metamodelType="/0/@diagram/@topLevelNodes.4/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseSubjectFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.figure.SubjectFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="200"

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

             key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

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

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

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

+            editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

         <modelFacet>

           <metaClass

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

@@ -945,12 +949,13 @@
             visualID="5023"

             editPartClassName="ComponentInPackageNameEditPart"

             itemSemanticEditPolicyClassName="ComponentInPackageNameItemSemanticEditPolicy"

-            notationViewFactoryClassName="ComponentName3ViewFactory">

+            notationViewFactoryClassName="ComponentName3ViewFactory"

+            elementIcon="true">

           <diagramRunTimeClass

               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:ParentAssignedViewmap"

-              getterName="getUseCaseSubjectFigure_name"

+              getterName="getNameLabel"

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

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

@@ -960,6 +965,26 @@
                 href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

           </modelFacet>

         </labels>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="6051"

+            editPartClassName="ComponentInPackageFloatingLabelEditPart"

+            itemSemanticEditPolicyClassName="ComponentFloatingLabelItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

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

+              viewPattern=""

+              editorPattern=""

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

       </childNodes>

       <childNodes

           visualID="3014"

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

         <viewmap

             xsi:type="gmfgen:ParentAssignedViewmap"

-            getterName="getUseCaseSubjectFigure_contents"

+            getterName="getUseCasesContainerFigure"

             figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

@@ -3023,7 +3048,7 @@
         extensibleViaService="true">

       <implementations

           xsi:type="gmfgen:PredefinedParser"

-          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.9/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.1/@modelFacet /0/@diagram/@childNodes.2/@labels.1/@modelFacet /0/@diagram/@childNodes.9/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.3/@modelFacet /0/@diagram/@childNodes.8/@labels.3/@modelFacet /0/@diagram/@childNodes.6/@labels.3/@modelFacet"/>

+          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.9/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.1/@modelFacet /0/@diagram/@childNodes.2/@labels.1/@modelFacet /0/@diagram/@childNodes.9/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.3/@modelFacet /0/@diagram/@childNodes.8/@labels.3/@modelFacet /0/@diagram/@childNodes.6/@labels.3/@modelFacet /0/@diagram/@childNodes.10/@labels.1/@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 /0/@diagram/@childNodes.6/@labels.2/@modelFacet /0/@diagram/@childNodes.8/@labels.2/@modelFacet"/>

@@ -3053,7 +3078,7 @@
     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="manage edit part that extends NamedElementEditPart in common"

-        genView="/0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.3 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.10"

+        genView="/0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.3 /0/@diagram/@childNodes.3"

         name="NamedElementEditPart"

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

     <extensionNodes

@@ -3158,7 +3183,7 @@
     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="add superclass for floating Label"

-        genView="/0/@diagram/@topLevelNodes.2/@labels.1 /0/@diagram/@childNodes.2/@labels.1 /0/@diagram/@childNodes.9/@labels.1 /0/@diagram/@topLevelNodes.4/@labels.1 /0/@diagram/@topLevelNodes.0/@labels.3 /0/@diagram/@childNodes.8/@labels.3 /0/@diagram/@childNodes.6/@labels.3"

+        genView="/0/@diagram/@topLevelNodes.2/@labels.1 /0/@diagram/@childNodes.2/@labels.1 /0/@diagram/@childNodes.9/@labels.1 /0/@diagram/@topLevelNodes.4/@labels.1 /0/@diagram/@topLevelNodes.0/@labels.3 /0/@diagram/@childNodes.8/@labels.3 /0/@diagram/@childNodes.6/@labels.3 /0/@diagram/@childNodes.10/@labels.1"

         name="FloatingLabelEditPart"

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

     <extensionNodes

@@ -3171,16 +3196,17 @@
         xsi:type="papyrusgmfgenextension:SpecificLocatorExternalLabel"

         comment="Locator for external Floating label of RoundedCompartment EP"

         classpath="org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator"

-        genExternalNodeLabel="/0/@diagram/@topLevelNodes.2/@labels.1 /0/@diagram/@childNodes.2/@labels.1 /0/@diagram/@childNodes.9/@labels.1 /0/@diagram/@topLevelNodes.4/@labels.1 /0/@diagram/@topLevelNodes.0/@labels.3 /0/@diagram/@childNodes.8/@labels.3 /0/@diagram/@childNodes.6/@labels.3"/>

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

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment=""

         genView="/0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.8"

         name="RoundedCompartmentEditPart"

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

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="extends for SubjectNodeEditPart"

-        genView="/0/@diagram/@topLevelNodes.4"

+        genView="/0/@diagram/@topLevelNodes.4 /0/@diagram/@childNodes.10"

         name="SubjectNodeEditPart"

         superOwnedEditPart="org.eclipse.papyrus.uml.diagram.usecase.custom.edit.parts.SubjectNodeEditPart"/>

   </papyrusgmfgenextension:PapyrusExtensionRootNode>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorFloatingLabelEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorFloatingLabelEditPartTN.java
index ee2a97b981e..8c452e4eb25 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorFloatingLabelEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorFloatingLabelEditPartTN.java
@@ -116,14 +116,14 @@ public class ActorFloatingLabelEditPartTN extends
 

 	/**

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

-	 * 

+	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -740,7 +740,7 @@ public class ActorFloatingLabelEditPartTN extends
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

@@ -756,7 +756,7 @@ public class ActorFloatingLabelEditPartTN extends
 

 	/**

 	 * Updates the preference configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

@@ -772,7 +772,7 @@ public class ActorFloatingLabelEditPartTN extends
 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

+	 *

 	 * @param theRequest

 	 *            the direct edit request that starts the direct edit system

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentFloatingLabelEditPart.java
index 8e22ed0bd6e..b5b51b66163 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentFloatingLabelEditPart.java
@@ -116,14 +116,14 @@ public class ActorInComponentFloatingLabelEditPart extends
 

 	/**

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

-	 * 

+	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -740,7 +740,7 @@ public class ActorInComponentFloatingLabelEditPart extends
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

@@ -756,7 +756,7 @@ public class ActorInComponentFloatingLabelEditPart extends
 

 	/**

 	 * Updates the preference configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

@@ -772,7 +772,7 @@ public class ActorInComponentFloatingLabelEditPart extends
 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

+	 *

 	 * @param theRequest

 	 *            the direct edit request that starts the direct edit system

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageFloatingLabelEditPart.java
index 19ebfc7322e..9df3299ffc0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageFloatingLabelEditPart.java
@@ -116,14 +116,14 @@ public class ActorInPackageFloatingLabelEditPart extends
 

 	/**

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

-	 * 

+	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -740,7 +740,7 @@ public class ActorInPackageFloatingLabelEditPart extends
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

@@ -756,7 +756,7 @@ public class ActorInPackageFloatingLabelEditPart extends
 

 	/**

 	 * Updates the preference configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

@@ -772,7 +772,7 @@ public class ActorInPackageFloatingLabelEditPart extends
 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

+	 *

 	 * @param theRequest

 	 *            the direct edit request that starts the direct edit system

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
index 682b454bdda..1e48e438cb3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
@@ -11,36 +11,48 @@
  */

 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.emf.common.notify.Notification;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

 import org.eclipse.gef.Request;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.editpolicies.LayoutEditPolicy;

 import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

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

 import org.eclipse.gef.requests.CreateRequest;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

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

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

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

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

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

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

-import org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseSubjectFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.figure.SubjectFigure;

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

 import org.eclipse.swt.graphics.Color;

 

 /**

  * @generated

  */

-public class ComponentInPackageEditPart extends NamedElementEditPart {

+public class ComponentInPackageEditPart extends SubjectNodeEditPart {

 

 	/**

 	 * @generated

@@ -74,6 +86,7 @@ public class ComponentInPackageEditPart extends NamedElementEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

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

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

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

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

 	}

@@ -86,6 +99,20 @@ public class ComponentInPackageEditPart extends NamedElementEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

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

+				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				case ComponentInPackageFloatingLabelEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						@Override

+						protected List<?> createSelectionHandles() {

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

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					}

+					;

+				}

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

 				if (result == null) {

 					result = new NonResizableEditPolicy();

@@ -113,6 +140,19 @@ public class ComponentInPackageEditPart extends NamedElementEditPart {
 	 **/

 	@Override

 	protected void handleNotificationEvent(Notification event) {

+		/*

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

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+			Object notifier = event.getNotifier();

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

+			if (!(notifier instanceof Edge)) {

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

+					return;

+				}

+			}

+		}

 		super.handleNotificationEvent(event);

 

 	}

@@ -122,7 +162,7 @@ public class ComponentInPackageEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected IFigure createNodeShape() {

-		return primaryShape = new UseCaseSubjectFigure();

+		return primaryShape = new SubjectFigure();

 	}

 

 	/**

@@ -131,8 +171,8 @@ public class ComponentInPackageEditPart extends NamedElementEditPart {
 	 * @generated

 	 */

 	@Override

-	public UseCaseSubjectFigure getPrimaryShape() {

-		return (UseCaseSubjectFigure) primaryShape;

+	public SubjectFigure getPrimaryShape() {

+		return (SubjectFigure) primaryShape;

 	}

 

 	/**

@@ -140,13 +180,13 @@ public class ComponentInPackageEditPart extends NamedElementEditPart {
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof ComponentInPackageNameEditPart) {

-			((ComponentInPackageNameEditPart) childEditPart).setLabel(getPrimaryShape().getUseCaseSubjectFigure_name());

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

 			return true;

 		}

 

 

 		if (childEditPart instanceof ComponentUsecases3EditPart) {

-			IFigure pane = getPrimaryShape().getUseCaseSubjectFigure_contents();

+			IFigure pane = getPrimaryShape().getUseCasesContainerFigure();

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

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

 			return true;

@@ -163,7 +203,7 @@ public class ComponentInPackageEditPart extends NamedElementEditPart {
 			return true;

 		}

 		if (childEditPart instanceof ComponentUsecases3EditPart) {

-			IFigure pane = getPrimaryShape().getUseCaseSubjectFigure_contents();

+			IFigure pane = getPrimaryShape().getUseCasesContainerFigure();

 			pane.remove(((ComponentUsecases3EditPart) childEditPart).getFigure());

 			return true;

 		}

@@ -198,7 +238,10 @@ public class ComponentInPackageEditPart extends NamedElementEditPart {
 	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		if (editPart instanceof ComponentUsecases3EditPart) {

-			return getPrimaryShape().getUseCaseSubjectFigure_contents();

+			return getPrimaryShape().getUseCasesContainerFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

 	}

@@ -207,6 +250,20 @@ public class ComponentInPackageEditPart extends NamedElementEditPart {
 	 * @generated

 	 */

 	@Override

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof ComponentInPackageFloatingLabelEditPart) {

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

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

+		} else

+		{

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(200, 400);

 		return result;

@@ -221,7 +278,7 @@ public class ComponentInPackageEditPart extends NamedElementEditPart {
 	 * @generated

 	 */

 	@Override

-	protected NodeFigure createNodeFigure() {

+	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageFloatingLabelEditPart.java
new file mode 100644
index 00000000000..af196e7b475
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageFloatingLabelEditPart.java
@@ -0,0 +1,861 @@
+/**

+ * Copyright (c) 2014 CEA LIST.

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.uml.diagram.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.custom.BusyIndicator;

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

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

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

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

+import org.eclipse.ui.PlatformUI;

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

+

+/**

+ * @generated

+ */

+public class ComponentInPackageFloatingLabelEditPart extends

+		FloatingLabelEditPart

+		implements ITextAwareEditPart, IBorderItemEditPart

+{

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6051;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

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

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageFloatingLabelEditPart.VISUAL_ID), new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComponentInPackageFloatingLabelEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

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

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

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

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

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void refreshBounds() {

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

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

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

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

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

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

+		} else if (figure instanceof ILabelFigure) {

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

+		} else {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if (figure instanceof WrappingLabel) {

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

+		} else if (figure instanceof ILabelFigure) {

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

+		} else {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

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

+		} else if (figure instanceof ILabelFigure) {

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

+		} else {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if (figure instanceof WrappingLabel) {

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

+		} else if (figure instanceof ILabelFigure) {

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

+		} else {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure

+			figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

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

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

+		}

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

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

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

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public String getEditText() {

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

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

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			@Override

+			public String isValid(final Object value) {

+				if (value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

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

+

+											@Override

+											public void run() {

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

+											}

+										});

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

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IContentAssistProcessor getCompletionProcessor() {

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

+			return null;

+		}

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

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public IParser getParser() {

+		if (parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Component_3013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageFloatingLabelEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

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

+

+			@Override

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if (getManager() instanceof TextDirectEditManager) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if (getManager() instanceof TextDirectEditManager) {

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

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch (directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

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

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if (configuration instanceof ICustomDirectEditorConfiguration) {

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

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if (configuration instanceof IPopupEditorConfiguration) {

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

+					helper.showEditor();

+					return;

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if (configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

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

+

+						@Override

+						protected void doExecute() {

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

+

+						}

+					};

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

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

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

+				@Override

+				public void run() {

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

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

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

+							performDirectEdit(initialChar.charValue());

+						}

+						else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if (maskLabelPolicy == null) {

+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

+		}

+		if (maskLabelPolicy == null) {

+			View view = (View) getModel();

+			if (view.isVisible()) {

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

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

+			}

+			else {

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

+				setLabelIconHelper(getFigure(), null);

+			}

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

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

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

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

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

+		}

+		if (resolveSemanticElement() instanceof Feature) {

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

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

+			}

+			else {

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

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

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

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

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void refreshFont() {

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null) {

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

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

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

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void addSemanticListeners() {

+		if (getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

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

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

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

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void removeSemanticListeners() {

+		if (parserElements != null) {

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

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

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if (accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				@Override

+				public void getName(AccessibleEvent e) {

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

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

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

+	 *

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

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if (checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if (checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

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

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if (resolveSemanticElement() != null) {

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

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 *

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

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if (configuration == null) {

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

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

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

+			} else {

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

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

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

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

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

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

+					.eClass().getInstanceClassName());

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

+			configuration = null;

+		}

+	}

+

+	/**

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

+	 * 

+	 * @param theRequest

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

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

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

+

+				@Override

+				public void run() {

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

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

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

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

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

+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

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

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

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

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

+			refreshUnderline();

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

+			refreshStrikeThrough();

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

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

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

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

+			refreshFont();

+		} else {

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

+				refreshLabel();

+			}

+			if (getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

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

+					removeSemanticListeners();

+					if (resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new PapyrusWrappingLabel();

+	}

+

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageNameEditPart.java
index 52a061c0306..0ac6fcfaed0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageNameEditPart.java
@@ -18,6 +18,7 @@ import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;

 import org.eclipse.draw2d.geometry.Point;

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

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

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.transaction.RecordingCommand;

 import org.eclipse.emf.transaction.RunnableWithResult;

@@ -57,6 +58,8 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

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

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

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

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

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

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

@@ -64,6 +67,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEd
 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

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

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

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

@@ -239,6 +243,16 @@ public class ComponentInPackageNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if (parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for (View view : views) {

+			if (AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

 		return null;

 	}

 

@@ -817,6 +831,9 @@ public class ComponentInPackageNameEditPart extends PapyrusCompartmentEditPart i
 				}

 			}

 		}

+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

 		super.handleNotificationEvent(event);

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierFloatingLabelEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierFloatingLabelEditPartTN.java
index f6f9411e5c0..0d1fb8d7110 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierFloatingLabelEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierFloatingLabelEditPartTN.java
@@ -116,14 +116,14 @@ public class SubjectClassifierFloatingLabelEditPartTN extends
 

 	/**

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

-	 * 

+	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -740,7 +740,7 @@ public class SubjectClassifierFloatingLabelEditPartTN extends
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

@@ -756,7 +756,7 @@ public class SubjectClassifierFloatingLabelEditPartTN extends
 

 	/**

 	 * Updates the preference configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

@@ -772,7 +772,7 @@ public class SubjectClassifierFloatingLabelEditPartTN extends
 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

+	 *

 	 * @param theRequest

 	 *            the direct edit request that starts the direct edit system

 	 * @generated

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 a0c80fb0a4f..ffe75015805 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
@@ -210,6 +210,9 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case ComponentInPackageNameEditPart.VISUAL_ID:

 				return new ComponentInPackageNameEditPart(view);

 

+			case ComponentInPackageFloatingLabelEditPart.VISUAL_ID:

+				return new ComponentInPackageFloatingLabelEditPart(view);

+

 			case PackageEditPartCN.VISUAL_ID:

 				return new PackageEditPartCN(view);

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseFloatingLabelEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseFloatingLabelEditPartTN.java
index 4ff94093dcd..f235cf13585 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseFloatingLabelEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseFloatingLabelEditPartTN.java
@@ -116,14 +116,14 @@ public class UseCaseFloatingLabelEditPartTN extends
 

 	/**

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

-	 * 

+	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -740,7 +740,7 @@ public class UseCaseFloatingLabelEditPartTN extends
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

@@ -756,7 +756,7 @@ public class UseCaseFloatingLabelEditPartTN extends
 

 	/**

 	 * Updates the preference configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

@@ -772,7 +772,7 @@ public class UseCaseFloatingLabelEditPartTN extends
 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

+	 *

 	 * @param theRequest

 	 *            the direct edit request that starts the direct edit system

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentFloatingLabelEditPart.java
index cc74733337c..1a83ddc600c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentFloatingLabelEditPart.java
@@ -116,14 +116,14 @@ public class UseCaseInComponentFloatingLabelEditPart extends
 

 	/**

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

-	 * 

+	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -740,7 +740,7 @@ public class UseCaseInComponentFloatingLabelEditPart extends
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

@@ -756,7 +756,7 @@ public class UseCaseInComponentFloatingLabelEditPart extends
 

 	/**

 	 * Updates the preference configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

@@ -772,7 +772,7 @@ public class UseCaseInComponentFloatingLabelEditPart extends
 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

+	 *

 	 * @param theRequest

 	 *            the direct edit request that starts the direct edit system

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageFloatingLabelEditPart.java
index ef17edfcd2e..568d1d18e83 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageFloatingLabelEditPart.java
@@ -116,14 +116,14 @@ public class UseCaseInPackageFloatingLabelEditPart extends
 

 	/**

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

-	 * 

+	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

+	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -740,7 +740,7 @@ public class UseCaseInPackageFloatingLabelEditPart extends
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

@@ -756,7 +756,7 @@ public class UseCaseInPackageFloatingLabelEditPart extends
 

 	/**

 	 * Updates the preference configuration

-	 * 

+	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

@@ -772,7 +772,7 @@ public class UseCaseInPackageFloatingLabelEditPart extends
 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

+	 *

 	 * @param theRequest

 	 *            the direct edit request that starts the direct edit system

 	 * @generated

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 1630104d6d7..f9014b83a29 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
@@ -50,6 +50,7 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

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

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

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

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

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

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

@@ -573,6 +574,9 @@ public class UMLVisualIDRegistry {
 			if (ComponentInPackageNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

+			if (ComponentInPackageFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

 			if (ComponentUsecases3EditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java
index 631b1543535..80fc0eedc2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java
@@ -46,6 +46,7 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationNameEditPar
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentBodyEditPartCN;

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

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

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

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

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

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

@@ -703,6 +704,25 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	/**

 	 * @generated

 	 */

+	private IParser componentName_6051Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponentName_6051Parser() {

+		if (componentName_6051Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

+			MessageFormatParser parser = new MessageFormatParser(features);

+			componentName_6051Parser = parser;

+		}

+		return componentName_6051Parser;

+	}

+

+	/**

+	 * @generated

+	 */

 	private IParser packageName_5024Parser;

 

 	/**

@@ -1055,6 +1075,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 

 		case ComponentInPackageNameEditPart.VISUAL_ID:

 			return getComponentName_5023Parser();

+		case ComponentInPackageFloatingLabelEditPart.VISUAL_ID:

+			return getComponentName_6051Parser();

 

 		case PackageNameEditPartCN.VISUAL_ID:

 			return getPackageName_5024Parser();

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 463cb78bdab..e414479a4dd 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
@@ -90,6 +90,7 @@ import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartTN;
 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

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

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

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

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

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

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

@@ -920,6 +921,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

 		Node label5023 = createLabel(node, UMLVisualIDRegistry.getType(ComponentInPackageNameEditPart.VISUAL_ID));

+		Node label6051 = createLabel(node, UMLVisualIDRegistry.getType(ComponentInPackageFloatingLabelEditPart.VISUAL_ID));

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

+		Location location6051 = (Location) label6051.getLayoutConstraint();

+		location6051.setX(0);

+		location6051.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(ComponentUsecases3EditPart.VISUAL_ID), false, false, false, false);

 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

 		return node;