diff options
| author | sboyko | 2014-10-23 14:40:12 +0000 |
|---|---|---|
| committer | sboyko | 2014-10-23 14:40:12 +0000 |
| commit | 6823cc99041347f1ad2fb2a370adef2972f556c2 (patch) | |
| tree | e38cba12bc80aa99c44572696ea2f2af419e0565 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence | |
| parent | c89902cfceddb632886cbabe0c00728ab4bac54f (diff) | |
| download | org.eclipse.papyrus-6823cc99041347f1ad2fb2a370adef2972f556c2.tar.gz org.eclipse.papyrus-6823cc99041347f1ad2fb2a370adef2972f556c2.tar.xz org.eclipse.papyrus-6823cc99041347f1ad2fb2a370adef2972f556c2.zip | |
Bug 445271 - [Sequence Diagram] Cannot ceate a MessageCreate from within
a Combined Fragment to a place outside the CF
Change-Id: Ibed7a460f1c2c9c9fef4682fe40d72a4c64194af
Signed-off-by: sboyko <serg.boyko2011@gmail.com>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence')
3 files changed, 3 insertions, 15 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage4CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage4CreateCommand.java index 133f497f541..e83df0eae9f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage4CreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage4CreateCommand.java @@ -53,6 +53,7 @@ public class CustomMessage4CreateCommand extends Message4CreateCommand { */
@Override
public boolean canExecute() {
+ // #445271: we don't care about CommandHelper.hasValidContainer()
if (source == null && target == null) {
return false;
}
@@ -69,11 +70,6 @@ public class CustomMessage4CreateCommand extends Message4CreateCommand { if (getContainer() == null) {
return false;
}
- if (getSource() != null && getTarget() != null) {
- if (!CommandHelper.hasValidContainer(getRequest())) {
- return false;
- }
- }
if (!UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateMessage_4006(getContainer(), getSource(), getTarget())) {
return false;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage6CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage6CreateCommand.java index 7b9a6cd47c7..16810656d28 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage6CreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage6CreateCommand.java @@ -51,14 +51,10 @@ public class CustomMessage6CreateCommand extends Message6CreateCommand { */
@Override
public boolean canExecute() {
+ // #445271: we don't care about CommandHelper.hasValidContainer()
if (!super.canExecute()) {
return false;
}
- if (getSource() != null && getTarget() != null) {
- if (!CommandHelper.hasValidContainer(getRequest())) {
- return false;
- }
- }
return MessageConnectionHelper.canExist(MessageSort.ASYNCH_SIGNAL_LITERAL, getSource(), null);
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage7CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage7CreateCommand.java index deea9551273..88e70cb33cd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage7CreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage7CreateCommand.java @@ -51,14 +51,10 @@ public class CustomMessage7CreateCommand extends Message7CreateCommand { */
@Override
public boolean canExecute() {
+ // #445271: we don't care about CommandHelper.hasValidContainer()
if (!super.canExecute()) {
return false;
}
- if (getSource() != null && getTarget() != null) {
- if (!CommandHelper.hasValidContainer(getRequest())) {
- return false;
- }
- }
return MessageConnectionHelper.canExist(MessageSort.ASYNCH_SIGNAL_LITERAL, null, getTarget());
}
|