From b1c4f32cf9a29249bcde41def4d46cdfed6919ac Mon Sep 17 00:00:00 2001 From: Camille Letavernier Date: Mon, 6 Aug 2018 16:08:40 +0200 Subject: Disable some Lifeline Policies when manipulating GeneralOrdering - These policies should only work with Messages Change-Id: I446b062625d359e4c6b58ce9f290881be37e0138 Signed-off-by: Camille Letavernier --- .../sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java | 5 +++-- .../sequence/edit/policies/OLDSequenceGraphicalNodeEditPolicy.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java index 352fbe3159a..b0dcbf1a88f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java @@ -43,6 +43,7 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.sequence.command.OLDCreateGateViewCommand; import org.eclipse.papyrus.uml.diagram.sequence.draw2d.routers.MessageRouter; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpecificationEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractMessageEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageCreateEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageDeleteEditPart; @@ -212,7 +213,7 @@ public class LifelineChildGraphicalNodeEditPolicy extends OLDSequenceGraphicalNo } } Command command = super.getReconnectSourceCommand(request); - if (command != null) { + if (command != null && request.getConnectionEditPart() instanceof AbstractMessageEditPart) { command = OccurrenceSpecificationMoveHelper.completeReconnectConnectionCommand(command, request, getConnectableEditPart()); if (request.getConnectionEditPart() instanceof MessageCreateEditPart && request.getTarget() instanceof LifelineEditPart) { LifelineEditPart newSource = (LifelineEditPart) request.getTarget(); @@ -248,7 +249,7 @@ public class LifelineChildGraphicalNodeEditPolicy extends OLDSequenceGraphicalNo } Command command = super.getReconnectTargetCommand(request); - if (command != null) { + if (command != null && request.getConnectionEditPart() instanceof AbstractMessageEditPart) { command = OccurrenceSpecificationMoveHelper.completeReconnectConnectionCommand(command, request, getConnectableEditPart()); if (request.getConnectionEditPart() instanceof MessageCreateEditPart && request.getTarget() instanceof LifelineEditPart) { command = LifelineMessageCreateHelper.reconnectMessageCreateTarget(request, command); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDSequenceGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDSequenceGraphicalNodeEditPolicy.java index 16b17c25efd..b9df7329b15 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDSequenceGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDSequenceGraphicalNodeEditPolicy.java @@ -54,6 +54,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IHintedType; import org.eclipse.gmf.runtime.notation.Edge; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractMessageEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionFragmentEditPart; @@ -427,7 +428,7 @@ public class OLDSequenceGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy } Command command = super.getReconnectSourceCommand(request); // //Ordering message occurrence specifications after message reconnected, See https://bugs.eclipse.org/bugs/show_bug.cgi?id=403233 - if (command != null && command.canExecute()) { + if (command != null && command.canExecute() && request.getConnectionEditPart() instanceof AbstractMessageEditPart) { command = command.chain(FragmentsOrdererHelper.createOrderingFragmentsCommand(getHost(), request)); } return command; @@ -462,7 +463,7 @@ public class OLDSequenceGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy // } Command command = super.getReconnectTargetCommand(request); // Ordering message occurrence specifications after message reconnected, See https://bugs.eclipse.org/bugs/show_bug.cgi?id=403233 - if (command != null && command.canExecute()) { + if (command != null && command.canExecute() && request.getConnectionEditPart() instanceof AbstractMessageEditPart) { command = command.chain(FragmentsOrdererHelper.createOrderingFragmentsCommand(getHost(), request)); } return command; -- cgit v1.2.3