407054: [Activity] Activity diagram shall reuse UML.Edit commands to create elements

https://bugs.eclipse.org/bugs/show_bug.cgi?id=407054

- updated for activity edges and comment/constraint links.
- fixed a runtime exception for modeling assistants on Activity compartment
- updated code generator for uml.edit based diagrams.

1 files changed, 184 insertions, 0 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExceptionHandlerEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExceptionHandlerEditHelper.java
new file mode 100644
index 00000000000..e229e33f29d
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExceptionHandlerEditHelper.java
@@ -0,0 +1,184 @@
+/*****************************************************************************

+ * Copyright (c) 2011-2012 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;

+import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.service.types.command.ExceptionHandlerReorientCommand;

+import org.eclipse.papyrus.uml.service.types.utils.RequestParameterUtils;

+import org.eclipse.uml2.uml.ActivityNode;

+import org.eclipse.uml2.uml.ExceptionHandler;

+import org.eclipse.uml2.uml.ExecutableNode;

+import org.eclipse.uml2.uml.ObjectNode;

+

+/**

+ * Edit helper class for binary {@link ExceptionHandler}

+ */

+public class ExceptionHandlerEditHelper extends ElementEditHelper {

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected ICommand getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		return new ExceptionHandlerReorientCommand(req);

+	}

+

+	/**

+	 * Test if the relationship creation is allowed.

+	 * 

+	 * @param source

+	 *        the relationship source can be null

+	 * @param target

+	 *        the relationship target can be null

+	 * @param sourceView

+	 *        the relationship graphical source can be null

+	 * @param targetView

+	 *        the relationship graphical target can be null

+	 * @return true if the creation is allowed

+	 */

+	protected boolean canCreate(EObject source, EObject target, View sourceView, View targetView) {

+

+		if((source != null) && !(source instanceof ActivityNode)) {

+			return false;

+		}

+

+		if((target != null) && !(target instanceof ActivityNode)) {

+			return false;

+		}

+

+		return true;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected ICommand getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		EObject source = req.getSource();

+		EObject target = req.getTarget();

+

+		boolean noSourceOrTarget = (source == null || target == null);

+		boolean noSourceAndTarget = (source == null && target == null);

+

+		if(!noSourceAndTarget && !canCreate(source, target, RequestParameterUtils.getSourceView(req), RequestParameterUtils.getTargetView(req))) {

+			// Abort creation.

+			return UnexecutableCommand.INSTANCE;

+		}

+

+		if(noSourceOrTarget && !noSourceAndTarget) {

+			// The request isn't complete yet. Return the identity command so

+			// that the create relationship gesture is enabled.

+			if(source != null && !(source instanceof ExecutableNode)) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return IdentityCommand.INSTANCE;

+		}

+

+		// Propose a semantic container for the new Exception Handler.

+		ExecutableNode proposedContainer = deduceContainer(req);

+		if(proposedContainer == null) {

+			return UnexecutableCommand.INSTANCE;

+		}

+

+		req.setContainer(proposedContainer);

+

+		return new CreateRelationshipCommand(req);

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected ExecutableNode deduceContainer(CreateRelationshipRequest req) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = req.getSource(); element != null; element = element.eContainer()) {

+			if(element instanceof ExecutableNode) {

+				return (ExecutableNode)element;

+			}

+		}

+		return null;

+	}

+	

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected ICommand getConfigureCommand(final ConfigureRequest req) {

+

+		ICommand configureCommand = new ConfigureElementCommand(req) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+

+				ExceptionHandler element = (ExceptionHandler)req.getElementToConfigure();

+

+				if(req.getParameter(CreateRelationshipRequest.SOURCE) != null) {

+					element.setProtectedNode(getSourceObject(req));

+				}

+

+				if(req.getParameter(CreateRelationshipRequest.TARGET) != null) {

+					element.setExceptionInput(getTargetObject(req));

+				}

+

+				return CommandResult.newOKCommandResult(element);

+			}

+		};

+

+		return CompositeCommand.compose(configureCommand, super.getConfigureCommand(req));

+	}

+	

+	/**

+	 * This method provides the object to be use as source.

+	 * 

+	 * @return the source value (EList or EObject)

+	 */

+	protected ExecutableNode getSourceObject(ConfigureRequest req) {

+		Object result = req.getParameter(CreateRelationshipRequest.SOURCE);

+		if(result instanceof ExecutableNode) {

+			return (ExecutableNode)result;

+		}

+		return null;

+	}

+

+	/**

+	 * This method provides the object to be used as target.

+	 * 

+	 * @return the target value (EList or EObject)

+	 */

+	protected ObjectNode getTargetObject(ConfigureRequest req) {

+		Object result = req.getParameter(CreateRelationshipRequest.TARGET);

+		if(result instanceof ObjectNode) {

+			return (ObjectNode)result;

+		}

+		return null;

+	}

+

+}