diff options
Diffstat (limited to 'plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ControlFlowReorientCommand.java')
-rw-r--r-- | plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ControlFlowReorientCommand.java | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ControlFlowReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ControlFlowReorientCommand.java index 49a7d777c31..e4a0f5e8dec 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ControlFlowReorientCommand.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ControlFlowReorientCommand.java @@ -21,9 +21,12 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.papyrus.uml.tools.utils.ControlFlowUtil;
import org.eclipse.uml2.uml.Activity;
import org.eclipse.uml2.uml.ActivityNode;
import org.eclipse.uml2.uml.ControlFlow;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.StructuredActivityNode;
/**
* <pre>
@@ -39,11 +42,10 @@ public class ControlFlowReorientCommand extends EditElementCommand { protected final EObject newEnd;
/**
- * <pre>
* Constructor.
*
- * @param request the re-orient relationship request.
- * </pre>
+ * @param request
+ * the re-orient relationship request.
*/
public ControlFlowReorientCommand(ReorientRelationshipRequest request) {
super(request.getLabel(), request.getRelationship(), request);
@@ -53,53 +55,51 @@ public class ControlFlowReorientCommand extends EditElementCommand { }
/**
- * <pre>
* @see org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand#canExecute()
*
* @return true if the command is executable.
- * </pre>
*/
public boolean canExecute() {
- if(false == getElementToEdit() instanceof ControlFlow) {
+ if (false == getElementToEdit() instanceof ControlFlow) {
return false;
}
- if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
+ if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
return canReorientSource();
}
- if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
+ if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
return canReorientTarget();
}
return false;
}
protected boolean canReorientSource() {
- if(!(oldEnd instanceof ActivityNode && newEnd instanceof ActivityNode)) {
+ if (!(oldEnd instanceof ActivityNode && newEnd instanceof ActivityNode)) {
return false;
}
- if(!(getLink().eContainer() instanceof Activity)) {
+ if (!(getLink().eContainer() instanceof Activity) && !(getLink().eContainer() instanceof StructuredActivityNode)) {
return false;
}
- return true;
+ return ControlFlowUtil.canExistControlFlow((Element) getLink().eContainer(), getLink(), getNewSource(), getOldTarget());
}
protected boolean canReorientTarget() {
- if(!(oldEnd instanceof ActivityNode && newEnd instanceof ActivityNode)) {
+ if (!(oldEnd instanceof ActivityNode && newEnd instanceof ActivityNode)) {
return false;
}
- if(!(getLink().eContainer() instanceof Activity)) {
+ if (!(getLink().eContainer() instanceof Activity) && !(getLink().eContainer() instanceof StructuredActivityNode)) {
return false;
}
- return true;
+ return ControlFlowUtil.canExistControlFlow((Element) getLink().eContainer(), getLink(), getOldSource(), getNewTarget());
}
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- if(!canExecute()) {
+ if (!canExecute()) {
throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
}
- if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
+ if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
return reorientSource();
}
- if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
+ if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
return reorientTarget();
}
throw new IllegalStateException();
@@ -116,22 +116,22 @@ public class ControlFlowReorientCommand extends EditElementCommand { }
protected ControlFlow getLink() {
- return (ControlFlow)getElementToEdit();
+ return (ControlFlow) getElementToEdit();
}
protected ActivityNode getOldSource() {
- return (ActivityNode)oldEnd;
+ return (ActivityNode) oldEnd;
}
protected ActivityNode getNewSource() {
- return (ActivityNode)newEnd;
+ return (ActivityNode) newEnd;
}
protected ActivityNode getOldTarget() {
- return (ActivityNode)oldEnd;
+ return (ActivityNode) oldEnd;
}
protected ActivityNode getNewTarget() {
- return (ActivityNode)newEnd;
+ return (ActivityNode) newEnd;
}
}
|