269492: [All Diagrams] Display properties of a applied stereotypes as a " comment"

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

1 files changed, 10 insertions, 13 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
index bb6fd5e3469..f9f630c952c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
@@ -36,7 +36,6 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

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

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

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

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

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

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

@@ -60,6 +59,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

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

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

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

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

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

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

@@ -75,13 +75,12 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.FontData;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.PlatformUI;

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

 

 /**

  * @generated

  */

-public class DeploymentAppliedStereotypeEditPart extends LabelEditPart implements ITextAwareEditPart, ILabelRoleProvider

-

-{

+public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, ILabelRoleProvider {

 

 	/**

 	 * @generated

@@ -121,7 +120,6 @@ public class DeploymentAppliedStereotypeEditPart extends LabelEditPart implement
 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

 	/**

 	 * @generated

 	 */

@@ -313,7 +311,6 @@ public class DeploymentAppliedStereotypeEditPart extends LabelEditPart implement
 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -395,9 +392,7 @@ public class DeploymentAppliedStereotypeEditPart extends LabelEditPart implement
 	 * @generated

 	 */

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

 		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -424,7 +419,6 @@ public class DeploymentAppliedStereotypeEditPart extends LabelEditPart implement
 					return;

 				}

 				final Dialog finalDialog = dialog;

-

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

 					TransactionalEditingDomain domain = getEditingDomain();

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

@@ -432,7 +426,6 @@ public class DeploymentAppliedStereotypeEditPart extends LabelEditPart implement
 						@Override

 						protected void doExecute() {

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

-

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -440,7 +433,6 @@ public class DeploymentAppliedStereotypeEditPart extends LabelEditPart implement
 			}

 			break;

 		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-

 			// initialize the direct edit manager

 			try {

 				getEditingDomain().runExclusive(new Runnable() {

@@ -507,6 +499,13 @@ public class DeploymentAppliedStereotypeEditPart extends LabelEditPart implement
 		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);

+			}

+		}

 	}

 

 	/**

@@ -711,7 +710,6 @@ public class DeploymentAppliedStereotypeEditPart extends LabelEditPart implement
 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

@@ -736,5 +734,4 @@ public class DeploymentAppliedStereotypeEditPart extends LabelEditPart implement
 	public String getIconPathRole() {

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

 	}

-

 }