Bug 533689: [Tests] Tests are failing due to popup edit on

InteractionOperand creation

- Manage the edit parts using the DirectEditors with the correct version
of direct edition.

Change-Id: Id3c3d06d6beab9ca30b0afbf4e1203cbdec85e0f
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>

2 files changed, 247 insertions, 149 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BorderItemLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BorderItemLabelEditPart.java
index 41d5ddb2179..a807ea82b42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BorderItemLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BorderItemLabelEditPart.java
@@ -10,6 +10,7 @@
  * Contributors:
  *   Soyatec - Initial API and implementation
  *   Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 440230 : Label Margin
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 533689
  *
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
@@ -58,6 +59,7 @@ 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.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;
@@ -366,29 +368,45 @@ public abstract class BorderItemLabelEditPart extends PapyrusLabelEditPart imple
 		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 IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+				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()));
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
+							configuration.getTextToEdit(resolveSemanticElement()));
 				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);
+					dialog = new ExtendedDirectEditionDialog(
+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
+							configuration.getTextToEdit(resolveSemanticElement()), configuration);
 				} else {
 					return;
 				}
 				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());
+							configuration.postEditAction(resolveSemanticElement(),
+									((ILabelEditorDialog) finalDialog).getValue());
+
 						}
 					};
 					domain.getCommandStack().execute(command);
@@ -424,6 +442,36 @@ public abstract class BorderItemLabelEditPart extends PapyrusLabelEditPart imple
 		}
 	}
 
+	/**
+	 * This allows to initialize the direct edit manager for the edit.
+	 * 
+	 * @param request
+	 *            The called request.
+	 * @since 5.0
+	 */
+	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();
+		}
+	}
+	
 	@Override
 	protected void refreshVisuals() {
 		super.refreshVisuals();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandGuardEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandGuardEditPart.java
index ab0363c45f7..a95d7729661 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandGuardEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandGuardEditPart.java
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *   Soyatec - Initial API and implementation
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 533689
  *
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
@@ -87,6 +88,7 @@ import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper;
 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;
@@ -464,29 +466,45 @@ public class InteractionOperandGuardEditPart extends ShapeEditPart implements IT
 		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 IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+				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()));
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(
+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
+							configuration.getTextToEdit(resolveSemanticElement()));
 				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);
+					dialog = new ExtendedDirectEditionDialog(
+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(),
+							configuration.getTextToEdit(resolveSemanticElement()), configuration);
 				} else {
 					return;
 				}
 				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());
+							configuration.postEditAction(resolveSemanticElement(),
+									((ILabelEditorDialog) finalDialog).getValue());
+
 						}
 					};
 					domain.getCommandStack().execute(command);
@@ -523,6 +541,36 @@ public class InteractionOperandGuardEditPart extends ShapeEditPart implements IT
 
 	}
 
+	/**
+	 * This allows to initialize the direct edit manager for the edit.
+	 * 
+	 * @param request
+	 *            The called request.
+	 * @since 5.0
+	 */
+	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();
+		}
+	}
+
 	@Override
 	protected void refreshVisuals() {
 		super.refreshVisuals();
@@ -535,6 +583,7 @@ public class InteractionOperandGuardEditPart extends ShapeEditPart implements IT
 
 
 	}
+
 	/**
 	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#notifyChanged(org.eclipse.emf.common.notify.Notification)
 	 *
@@ -545,6 +594,7 @@ public class InteractionOperandGuardEditPart extends ShapeEditPart implements IT
 
 		super.notifyChanged(notification);
 	}
+
 	@Override
 	public void refreshBounds() {
 		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
@@ -669,7 +719,7 @@ public class InteractionOperandGuardEditPart extends ShapeEditPart implements IT
 
 	protected boolean checkExtendedEditor() {
 		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement());
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this);
 		}
 		return false;
 	}
@@ -682,17 +732,17 @@ public class InteractionOperandGuardEditPart extends ShapeEditPart implements IT
 		if (configuration == null) {
 			final String languagePreferred = UMLDiagramEditorPlugin.getInstance().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
 			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement());
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);
 			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement());
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this);
 			}
 		}
 	}
 
 	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = UMLDiagramEditorPlugin.getInstance().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement());
+		String languagePreferred = UMLDiagramEditorPlugin.getInstance().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
 		if (languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement());
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this);
 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
 			configuration = null;
 		}
@@ -747,12 +797,12 @@ public class InteractionOperandGuardEditPart extends ShapeEditPart implements IT
 
 	@Override
 	protected IFigure createFigure() {
-		WrappingLabel label=null;
-		if(getParent() instanceof InteractionOperandEditPart){
-			InteractionOperandFigure fig=((InteractionOperandEditPart)getParent()).getPrimaryShape();
-			label=	fig.getInteractionConstraintLabel();
+		WrappingLabel label = null;
+		if (getParent() instanceof InteractionOperandEditPart) {
+			InteractionOperandFigure fig = ((InteractionOperandEditPart) getParent()).getPrimaryShape();
+			label = fig.getInteractionConstraintLabel();
 		}
-		//GuardFigure label = new GuardFigure();
+		// GuardFigure label = new GuardFigure();
 		// WrappingLabel label = new WrappingLabel();
 		defaultText = getLabelTextHelper(label);
 		return label;
@@ -956,167 +1006,167 @@ public class InteractionOperandGuardEditPart extends ShapeEditPart implements IT
 			return CommandResult.newOKCommandResult();
 		}
 
-	private LiteralInteger createLiteralInteger(int val) {
-		LiteralInteger li = UMLFactory.eINSTANCE.createLiteralInteger();
-		li.setValue(val);
-		return li;
-	}
+		private LiteralInteger createLiteralInteger(int val) {
+			LiteralInteger li = UMLFactory.eINSTANCE.createLiteralInteger();
+			li.setValue(val);
+			return li;
+		}
 
-	private void setIntValue(ValueSpecification spec, int val) {
-		if (spec instanceof LiteralInteger) {
-			((LiteralInteger) spec).setValue(val);
+		private void setIntValue(ValueSpecification spec, int val) {
+			if (spec instanceof LiteralInteger) {
+				((LiteralInteger) spec).setValue(val);
+			}
 		}
-	}
 
-	private int parseInt(String string, int defaultInt) {
-		try {
-			return Integer.parseInt(string);
-		} catch (NumberFormatException e) {
+		private int parseInt(String string, int defaultInt) {
+			try {
+				return Integer.parseInt(string);
+			} catch (NumberFormatException e) {
+			}
+			return defaultInt;
 		}
-		return defaultInt;
 	}
-}
 
-public class GuardFigure extends Figure implements ILabelFigure, IPapyrusNodeUMLElementFigure {
+	public class GuardFigure extends Figure implements ILabelFigure, IPapyrusNodeUMLElementFigure {
 
-	private WrappingLabel primaryLabel;
+		private WrappingLabel primaryLabel;
 
-	private PapyrusWrappingLabel stereotypeLabel;
+		private PapyrusWrappingLabel stereotypeLabel;
 
-	private WrappingLabel stereotypePropertiesInBraceContent;
+		private WrappingLabel stereotypePropertiesInBraceContent;
 
-	/**
-	 * Constructor.
-	 *
-	 */
-	public GuardFigure() {
-		ToolbarLayout layout = new ToolbarLayout(false);
-		layout.setStretchMinorAxis(true);
-		setLayoutManager(layout);
-		primaryLabel = new WrappingLabel();
-		primaryLabel.setTextWrap(true);
-		primaryLabel.setAlignment(PositionConstants.CENTER);
-		this.add(primaryLabel);
-	}
+		/**
+		 * Constructor.
+		 *
+		 */
+		public GuardFigure() {
+			ToolbarLayout layout = new ToolbarLayout(false);
+			layout.setStretchMinorAxis(true);
+			setLayoutManager(layout);
+			primaryLabel = new WrappingLabel();
+			primaryLabel.setTextWrap(true);
+			primaryLabel.setAlignment(PositionConstants.CENTER);
+			this.add(primaryLabel);
+		}
 
-	public WrappingLabel getPrimaryLabel() {
-		return primaryLabel;
-	}
+		public WrappingLabel getPrimaryLabel() {
+			return primaryLabel;
+		}
 
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure#setStereotypeDisplay(java.lang.String, org.eclipse.swt.graphics.Image)
-	 *
-	 * @param stereotypes
-	 * @param image
-	 */
+		/**
+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure#setStereotypeDisplay(java.lang.String, org.eclipse.swt.graphics.Image)
+		 *
+		 * @param stereotypes
+		 * @param image
+		 */
 
-	@Override
-	public void setStereotypeDisplay(String stereotypes, Image image) {
-		if ((stereotypes == null || stereotypes.trim().equals("")) && image == null) {
-			if (stereotypeLabel != null) {
-				remove(stereotypeLabel);
-			}
-			stereotypeLabel = null;
-		} else {
-			if (stereotypeLabel == null) {
-				stereotypeLabel = new PapyrusWrappingLabel();
-				add(stereotypeLabel, 0);
+		@Override
+		public void setStereotypeDisplay(String stereotypes, Image image) {
+			if ((stereotypes == null || stereotypes.trim().equals("")) && image == null) {
+				if (stereotypeLabel != null) {
+					remove(stereotypeLabel);
+				}
+				stereotypeLabel = null;
+			} else {
+				if (stereotypeLabel == null) {
+					stereotypeLabel = new PapyrusWrappingLabel();
+					add(stereotypeLabel, 0);
+				}
+				stereotypeLabel.setText(stereotypes);
+				stereotypeLabel.setIcon(image);
 			}
-			stereotypeLabel.setText(stereotypes);
-			stereotypeLabel.setIcon(image);
 		}
-	}
 
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure#setStereotypePropertiesInBrace(java.lang.String)
-	 *
-	 * @param stereotypeProperties
-	 */
+		/**
+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure#setStereotypePropertiesInBrace(java.lang.String)
+		 *
+		 * @param stereotypeProperties
+		 */
 
-	@Override
-	public void setStereotypePropertiesInBrace(String stereotypeProperties) {
-		if (stereotypeProperties == null || stereotypeProperties.trim().equals("")) {
-			if (stereotypePropertiesInBraceContent != null) {
-				remove(stereotypePropertiesInBraceContent);
-			}
-			stereotypePropertiesInBraceContent = null;
-		} else {
-			if (stereotypePropertiesInBraceContent == null) {
-				stereotypePropertiesInBraceContent = new WrappingLabel();
-				stereotypePropertiesInBraceContent.setOpaque(false);
-				int index = getChildren().indexOf(stereotypeLabel);
-				this.add(stereotypePropertiesInBraceContent, index + 1);
+		@Override
+		public void setStereotypePropertiesInBrace(String stereotypeProperties) {
+			if (stereotypeProperties == null || stereotypeProperties.trim().equals("")) {
+				if (stereotypePropertiesInBraceContent != null) {
+					remove(stereotypePropertiesInBraceContent);
+				}
+				stereotypePropertiesInBraceContent = null;
+			} else {
+				if (stereotypePropertiesInBraceContent == null) {
+					stereotypePropertiesInBraceContent = new WrappingLabel();
+					stereotypePropertiesInBraceContent.setOpaque(false);
+					int index = getChildren().indexOf(stereotypeLabel);
+					this.add(stereotypePropertiesInBraceContent, index + 1);
+				}
+				stereotypePropertiesInBraceContent.setText("{" + stereotypeProperties + "}");
 			}
-			stereotypePropertiesInBraceContent.setText("{" + stereotypeProperties + "}");
+
 		}
 
-	}
+		/**
+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure#setStereotypePropertiesInCompartment(java.lang.String)
+		 *
+		 * @param stereotypeProperties
+		 */
 
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure#setStereotypePropertiesInCompartment(java.lang.String)
-	 *
-	 * @param stereotypeProperties
-	 */
+		@Override
+		public void setStereotypePropertiesInCompartment(String stereotypeProperties) {
 
-	@Override
-	public void setStereotypePropertiesInCompartment(String stereotypeProperties) {
+		}
 
-	}
+		/**
+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure#getStereotypesLabel()
+		 *
+		 * @return
+		 */
 
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure#getStereotypesLabel()
-	 *
-	 * @return
-	 */
+		@Override
+		public PapyrusWrappingLabel getStereotypesLabel() {
+			return stereotypeLabel;
+		}
 
-	@Override
-	public PapyrusWrappingLabel getStereotypesLabel() {
-		return stereotypeLabel;
-	}
+		/**
+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure#setText(java.lang.String)
+		 *
+		 * @param text
+		 */
 
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure#setText(java.lang.String)
-	 *
-	 * @param text
-	 */
+		@Override
+		public void setText(String text) {
+			primaryLabel.setText(text);
+		}
 
-	@Override
-	public void setText(String text) {
-		primaryLabel.setText(text);
-	}
+		/**
+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure#getText()
+		 *
+		 * @return
+		 */
 
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure#getText()
-	 *
-	 * @return
-	 */
+		@Override
+		public String getText() {
+			return primaryLabel.getText();
+		}
 
-	@Override
-	public String getText() {
-		return primaryLabel.getText();
-	}
+		/**
+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure#setIcon(org.eclipse.swt.graphics.Image)
+		 *
+		 * @param icon
+		 */
 
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure#setIcon(org.eclipse.swt.graphics.Image)
-	 *
-	 * @param icon
-	 */
+		@Override
+		public void setIcon(Image icon) {
+			primaryLabel.setIcon(icon);
+		}
 
-	@Override
-	public void setIcon(Image icon) {
-		primaryLabel.setIcon(icon);
-	}
+		/**
+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure#getIcon()
+		 *
+		 * @return
+		 */
 
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure#getIcon()
-	 *
-	 * @return
-	 */
+		@Override
+		public Image getIcon() {
+			return primaryLabel.getIcon();
+		}
 
-	@Override
-	public Image getIcon() {
-		return primaryLabel.getIcon();
 	}
-
-}
 }