Merge branch 'master' of ssh://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus

1 files changed, 28 insertions, 9 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/commands/BroadcastSignalActionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/commands/BroadcastSignalActionCreateCommand.java
index c3a6011a126..5e8da048e88 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/commands/BroadcastSignalActionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/commands/BroadcastSignalActionCreateCommand.java
@@ -25,11 +25,16 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

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

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

 import org.eclipse.papyrus.uml.diagram.activity.providers.ElementInitializers;

+import org.eclipse.ui.PlatformUI;

 import org.eclipse.uml2.uml.Activity;

 import org.eclipse.uml2.uml.BroadcastSignalAction;

 import org.eclipse.uml2.uml.UMLFactory;

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

 

 /**

  * @generated

@@ -39,7 +44,7 @@ public class BroadcastSignalActionCreateCommand extends EditElementCommand {
 	/**

 	 * @generated

 	 */

-	private EClass eClass = null;

+	private Diagram diagram = null;

 

 	/**

 	 * @generated

@@ -49,24 +54,25 @@ public class BroadcastSignalActionCreateCommand extends EditElementCommand {
 	/**

 	 * @generated

 	 */

-	public BroadcastSignalActionCreateCommand(CreateElementRequest req, EObject eObject) {

+	public BroadcastSignalActionCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

 		super(req.getLabel(), null, req);

 		this.eObject = eObject;

-		this.eClass = eObject != null ? eObject.eClass() : null;

+		this.diagram = diagram;

 	}

 

 	/**

 	 * @generated

 	 */

-	public static BroadcastSignalActionCreateCommand create(CreateElementRequest req, EObject eObject) {

-		return new BroadcastSignalActionCreateCommand(req, eObject);

+	public static BroadcastSignalActionCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		return new BroadcastSignalActionCreateCommand(req, eObject, diagram);

 	}

 

 	/**

 	 * @generated

 	 */

-	public BroadcastSignalActionCreateCommand(CreateElementRequest req) {

+	public BroadcastSignalActionCreateCommand(CreateElementRequest req, Diagram diagram) {

 		super(req.getLabel(), null, req);

+		this.diagram = diagram;

 	}

 

 	/**

@@ -89,7 +95,9 @@ public class BroadcastSignalActionCreateCommand extends EditElementCommand {
 	 * @generated

 	 */

 	public boolean canExecute() {

-		return true;

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getBroadcastSignalAction());

+		return data.isPermitted();

 	}

 

 	/**

@@ -97,8 +105,19 @@ public class BroadcastSignalActionCreateCommand extends EditElementCommand {
 	 */

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

 		BroadcastSignalAction newElement = UMLFactory.eINSTANCE.createBroadcastSignalAction();

-		Activity owner = (Activity)getElementToEdit();

-		owner.getOwnedNodes().add(newElement);

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+				Activity qualifiedTarget = (Activity)target;

+				qualifiedTarget.getOwnedNodes().add(newElement);

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

 		ElementInitializers.getInstance().init_BroadcastSignalAction_3102(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest)getRequest()).setNewElement(newElement);