Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2018-08-06 08:27:46 -0400
committerCamille Letavernier2018-09-24 06:48:42 -0400
commitf6434672e029f00aea79baea587d9ff587915a84 (patch)
treedc442aeb94b0c618da075ff0444b5dc586a07aec
parent080aa4b85d5c47eed8e4f2e37dc44463932bb8fc (diff)
downloadorg.eclipse.papyrus-f6434672e029f00aea79baea587d9ff587915a84.tar.gz
org.eclipse.papyrus-f6434672e029f00aea79baea587d9ff587915a84.tar.xz
org.eclipse.papyrus-f6434672e029f00aea79baea587d9ff587915a84.zip
Bug 536639: [Sequence Diagram] Enable reconnect on Duration edit parts
https://bugs.eclipse.org/bugs/show_bug.cgi?id=536639 Change-Id: I04cc17b3fbafc6592fb775c4f19e135860de4f10 Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com>
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionOccurrenceGraphicalNodeEditPolicy.java17
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ExecutionSpecificationGraphicalNodeEditPolicy.java17
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageGraphicalNodeEditPolicy.java17
3 files changed, 24 insertions, 27 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionOccurrenceGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionOccurrenceGraphicalNodeEditPolicy.java
index 9280a3e9eda..80299d899a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionOccurrenceGraphicalNodeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionOccurrenceGraphicalNodeEditPolicy.java
@@ -18,7 +18,6 @@ import org.eclipse.draw2d.PolylineConnection;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gef.requests.CreateConnectionRequest;
import org.eclipse.gef.requests.ReconnectRequest;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
@@ -43,19 +42,19 @@ public class DestructionOccurrenceGraphicalNodeEditPolicy extends DefaultGraphic
@Override
protected Command getReconnectSourceCommand(ReconnectRequest request) {
- if (DurationLinkUtil.isDurationLink(request)) {
- // Bug 536639: Forbid reconnect on Duration edit parts
- return UnexecutableCommand.INSTANCE;
- }
+ // if (DurationLinkUtil.isDurationLink(request)) {
+ // // Bug 536639: Forbid reconnect on Duration edit parts
+ // return UnexecutableCommand.INSTANCE;
+ // }
return super.getReconnectSourceCommand(request);
}
@Override
protected Command getReconnectTargetCommand(ReconnectRequest request) {
- if (DurationLinkUtil.isDurationLink(request)) {
- // Bug 536639: Forbid reconnect on Duration edit parts
- return UnexecutableCommand.INSTANCE;
- }
+ // if (DurationLinkUtil.isDurationLink(request)) {
+ // // Bug 536639: Forbid reconnect on Duration edit parts
+ // return UnexecutableCommand.INSTANCE;
+ // }
return super.getReconnectTargetCommand(request);
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ExecutionSpecificationGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ExecutionSpecificationGraphicalNodeEditPolicy.java
index d0b00458df0..d4f2f3326b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ExecutionSpecificationGraphicalNodeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ExecutionSpecificationGraphicalNodeEditPolicy.java
@@ -18,7 +18,6 @@ import org.eclipse.draw2d.Connection;
import org.eclipse.draw2d.PolylineConnection;
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
import org.eclipse.gef.requests.CreateConnectionRequest;
import org.eclipse.gef.requests.ReconnectRequest;
@@ -100,19 +99,19 @@ public class ExecutionSpecificationGraphicalNodeEditPolicy extends ElementCreati
@Override
protected Command getReconnectSourceCommand(ReconnectRequest request) {
- if (DurationLinkUtil.isDurationLink(request)) {
- // Bug 536639: Forbid reconnect on Duration edit parts
- return UnexecutableCommand.INSTANCE;
- }
+ // if (DurationLinkUtil.isDurationLink(request)) {
+ // // Bug 536639: Forbid reconnect on Duration edit parts
+ // return UnexecutableCommand.INSTANCE;
+ // }
return super.getReconnectSourceCommand(request);
}
@Override
protected Command getReconnectTargetCommand(ReconnectRequest request) {
- if (DurationLinkUtil.isDurationLink(request)) {
- // Bug 536639: Forbid reconnect on Duration edit parts
- return UnexecutableCommand.INSTANCE;
- }
+ // if (DurationLinkUtil.isDurationLink(request)) {
+ // // Bug 536639: Forbid reconnect on Duration edit parts
+ // return UnexecutableCommand.INSTANCE;
+ // }
return super.getReconnectTargetCommand(request);
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageGraphicalNodeEditPolicy.java
index 3c424928eeb..417fe7be73b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageGraphicalNodeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageGraphicalNodeEditPolicy.java
@@ -19,7 +19,6 @@ import org.eclipse.draw2d.PolylineConnection;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gef.requests.CreateConnectionRequest;
import org.eclipse.gef.requests.ReconnectRequest;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy;
@@ -82,19 +81,19 @@ public class MessageGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy {
@Override
protected Command getReconnectSourceCommand(ReconnectRequest request) {
- if (DurationLinkUtil.isDurationLink(request)) {
- // Bug 536639: Forbid reconnect on Duration edit parts
- return UnexecutableCommand.INSTANCE;
- }
+ // if (DurationLinkUtil.isDurationLink(request)) {
+ // // Bug 536639: Forbid reconnect on Duration edit parts
+ // return UnexecutableCommand.INSTANCE;
+ // }
return super.getReconnectSourceCommand(request);
}
@Override
protected Command getReconnectTargetCommand(ReconnectRequest request) {
- if (DurationLinkUtil.isDurationLink(request)) {
- // Bug 536639: Forbid reconnect on Duration edit parts
- return UnexecutableCommand.INSTANCE;
- }
+ // if (DurationLinkUtil.isDurationLink(request)) {
+ // // Bug 536639: Forbid reconnect on Duration edit parts
+ // return UnexecutableCommand.INSTANCE;
+ // }
return super.getReconnectTargetCommand(request);
}

Back to the top