diff options
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util')
2 files changed, 16 insertions, 2 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationMoveHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationMoveHelper.java index 43009dd4c88..8c2f2cdfbe6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationMoveHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationMoveHelper.java @@ -249,6 +249,7 @@ public class OccurrenceSpecificationMoveHelper { // the message part must start or finish on the lifeline (with the event)
if (part instanceof ConnectionEditPart && !notToMoveEditParts.contains(part)) {
Request reconnectRequest = makeReconnectRequest((ConnectionEditPart) part, true, referencePoint, childToReconnectTo);
+ reconnectRequest.getExtendedData().put(SequenceUtil.DO_NOT_CHECK_HORIZONTALITY, true);
ArrayList<EditPart> senderList = SenderRequestUtils.getSenders(request);
SenderRequestUtils.addRequestSenders(reconnectRequest, senderList);
Command reconnect = childToReconnectTo.getCommand(reconnectRequest);
@@ -272,6 +273,7 @@ public class OccurrenceSpecificationMoveHelper { // the message part must start or finish on the lifeline (with the event)
if (part instanceof ConnectionEditPart && !notToMoveEditParts.contains(part)) {
Request reconnectRequest = makeReconnectRequest((ConnectionEditPart) part, false, referencePoint, childToReconnectTo);
+ reconnectRequest.getExtendedData().put(SequenceUtil.DO_NOT_CHECK_HORIZONTALITY, true);
ArrayList<EditPart> senderList = SenderRequestUtils.getSenders(request);
SenderRequestUtils.addRequestSenders(reconnectRequest, senderList);
Command reconnect = childToReconnectTo.getCommand(reconnectRequest);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java index b37d9fca6ae..fb3e9670032 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java @@ -152,6 +152,11 @@ public class SequenceUtil { public static final String OBSERVATION_LINK_REQUEST_RECONNECT_TARGET = "observation reconnect target"; //$NON-NLS-1$
/**
+ * Request parameters for not checking the horizontality during reconnect request.
+ */
+ public static final String DO_NOT_CHECK_HORIZONTALITY = "do not check horizontality"; //$NON-NLS-1$
+
+ /**
* Default vertical offset of lifeline
*/
public static final int LIFELINE_VERTICAL_OFFSET = 10;
@@ -445,7 +450,10 @@ public class SequenceUtil { return getAbsoluteEdgeExtremity(connection, isStart, false);
}
- static Point getAbsoluteEdgeExtremity(ConnectionNodeEditPart connection, boolean isStart, boolean relyOnMessageFigure) {
+ /**
+ * @since 4.1
+ */
+ public static Point getAbsoluteEdgeExtremity(ConnectionNodeEditPart connection, boolean isStart, boolean relyOnMessageFigure) {
Connection msgFigure = connection.getConnectionFigure();
if (connection.getNotationView() instanceof Edge && !relyOnMessageFigure) {
// rather take up to date model information
@@ -511,7 +519,10 @@ public class SequenceUtil { return findLocationOfMessageOccurrence(nodeEditPart, event, false);
}
- static Point findLocationOfMessageOccurrence(GraphicalEditPart nodeEditPart, MessageOccurrenceSpecification event, boolean relyOnMessageFigure) {
+ /**
+ * @since 4.1
+ */
+ public static Point findLocationOfMessageOccurrence(GraphicalEditPart nodeEditPart, MessageOccurrenceSpecification event, boolean relyOnMessageFigure) {
// messages to the node
List<?> targetConnections = nodeEditPart.getTargetConnections();
for (Object conn : targetConnections) {
@@ -801,6 +812,7 @@ public class SequenceUtil { * @param nodeEditPart
* the contained edit part or itself
* @return lifeline edit part or null
+ * @since 4.1
*/
public static LifelineEditPart getParentLifelinePart(EditPart nodeEditPart) {
EditPart parent = nodeEditPart;
|