diff options
author | Fanch BONNABESSE | 2017-11-07 15:31:18 +0000 |
---|---|---|
committer | Vincent Lorenzo | 2017-11-16 08:56:05 +0000 |
commit | 204da4c9f3dbbd6ac4cdd86a06d24ed6bb12f09b (patch) | |
tree | dafb38921f398f90f831f0a73207d284c88f0d27 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase | |
parent | 6f2e77515dcd40a801c2e25c7dba1099692c7cc9 (diff) | |
download | org.eclipse.papyrus-204da4c9f3dbbd6ac4cdd86a06d24ed6bb12f09b.tar.gz org.eclipse.papyrus-204da4c9f3dbbd6ac4cdd86a06d24ed6bb12f09b.tar.xz org.eclipse.papyrus-204da4c9f3dbbd6ac4cdd86a06d24ed6bb12f09b.zip |
Bug 525463: [SysML 1.1] Dash line not present when moving a floating
label
https://bugs.eclipse.org/bugs/show_bug.cgi?id=525463
Add an interface to check the modification of the EditPolicy.
Change-Id: Idb9b180ed38b0503f657b9dd33d51b1e8a963b58
Signed-off-by: Fanch BONNABESSE <fanch.bonnabesse@all4tec.net>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase')
2 files changed, 15 insertions, 10 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 1d068d2514e..b30768cb13f 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 @@ -3045,7 +3045,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 /0/@diagram/@childNodes.10/@labels.1" + 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 /0/@diagram/@topLevelNodes.0/@labels.0" name="FloatingLabelEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart"/> <extensionNodes diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorNameEditPartTN.java index 83c39657da1..bf153660634 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorNameEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorNameEditPartTN.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014 CEA LIST. + * Copyright (c) 2014, 2017 CEA LIST. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -8,6 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Fanch BONNABESSE (ALL4TEC) fanch.bonnabesse@all4tec.net - Bug 525463 */ package org.eclipse.papyrus.uml.diagram.usecase.edit.parts; @@ -58,18 +59,16 @@ 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.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; +import org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.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; @@ -86,7 +85,7 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ActorNameEditPartTN extends PapyrusLabelEditPart +public class ActorNameEditPartTN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider { /** @@ -116,12 +115,14 @@ public class ActorNameEditPartTN extends PapyrusLabelEditPart /** * 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; @@ -708,6 +709,7 @@ public class ActorNameEditPartTN extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { @@ -723,6 +725,7 @@ public class ActorNameEditPartTN extends PapyrusLabelEditPart /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { @@ -736,10 +739,12 @@ public class ActorNameEditPartTN extends PapyrusLabelEditPart } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * 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 { |