[#19515] Permission issue when two models conforming the same language are executed at same time

ylussaud · ylussaud · commit 64a6f481d0e8 · 2016-02-19T12:16:26.000+01:00
This path should be reverted when https://support.jira.obeo.fr/browse/VP-2710 will be fixed Bug: 19515
diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java
@@ -1,6 +1,7 @@
 package org.gemoc.executionframework.engine.core;
 
 import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.gemoc.xdsmlframework.api.core.IExecutionCheckpoint;
@@ -12,23 +13,23 @@ private CommandExecution() {
 
 	public static Object execute(TransactionalEditingDomain editingDomain, RecordingCommand command) {
 		final CommandStack commandStack = editingDomain.getCommandStack();
-		IExecutionCheckpoint checkpoint = IExecutionCheckpoint.CHECKPOINTS.get(editingDomain.getResourceSet());
+		ResourceSet rs = editingDomain.getResourceSet();
+		IExecutionCheckpoint checkpoint = IExecutionCheckpoint.CHECKPOINTS.get(rs);
 		Object result = null;
 		try {
 			if (checkpoint != null) {
-				checkpoint.allow(true);
+				checkpoint.allow(rs, true);
 			}
 			commandStack.execute(command);
 			if (command.getResult() != null && command.getResult().size() == 1) {
 				result = command.getResult().iterator().next();
 			}
 		} finally {
 			if (checkpoint != null) {
-				checkpoint.allow(false);
+				checkpoint.allow(rs, false);
 			}
 		}
 		return result;
 	}
 
-
 }
diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java
@@ -1,8 +1,11 @@
 package org.gemoc.executionframework.extensions.sirius.modelloader;
 
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.sirius.ecore.extender.business.api.permission.IAuthorityListener;
 import org.eclipse.sirius.ecore.extender.business.api.permission.LockStatus;
 import org.eclipse.sirius.ecore.extender.business.internal.permission.AbstractPermissionAuthority;
@@ -13,35 +16,49 @@ public class DebugPermissionAuthority extends AbstractPermissionAuthority
 
 	/**
 	 * Strictly positive if allowed.
+	 * FIXME we use a map here because of https://support.jira.obeo.fr/browse/VP-2710
 	 */
-	private int allow;
+	private static final Map<ResourceSet, Integer> allow = new HashMap<ResourceSet, Integer>();
 
-	public void allow(boolean allow) {
+	public void allow(ResourceSet rs, boolean allow) {
+		Integer integer = this.allow.get(rs);
 		if (allow) {
-			this.allow++;
+			if (integer == null) {
+				this.allow.put(rs, Integer.valueOf(1));
+			} else {
+				this.allow.put(rs, Integer.valueOf(integer.intValue() + 1));
+			}
 		} else {
-			this.allow--;
+			if (integer == null) {
+				this.allow.put(rs, Integer.valueOf(-1));
+			} else {
+				this.allow.put(rs, Integer.valueOf(integer.intValue() - 1));
+			}
 		}
 	}
 
 	@Override
 	public boolean canEditFeature(EObject eObj, String featureName) {
-		return allow > 0;
+		Integer integer = allow.get(eObj.eResource().getResourceSet());
+		return integer != null && integer.intValue() > 0;
 	}
 
 	@Override
 	public boolean canEditInstance(EObject eObj) {
-		return allow > 0;
+		Integer integer = allow.get(eObj.eResource().getResourceSet());
+		return integer != null && integer.intValue() > 0;
 	}
-	
+
 	@Override
 	public boolean canCreateIn(EObject eObj) {
-		return allow > 0;
+		Integer integer = allow.get(eObj.eResource().getResourceSet());
+		return integer != null && integer.intValue() > 0;
 	}
 
 	@Override
 	public boolean canDeleteInstance(EObject target) {
-		return allow > 0;
+		Integer integer = allow.get(target.eResource().getResourceSet());
+		return integer != null && integer.intValue() > 0;
 	}
 
 	@Override
@@ -63,7 +80,7 @@ public void notifyInstanceDeletion(EObject instance) {
 	public void setReportIssues(boolean report) {
 		// nothing to do here
 	}
-	
+
 	@Override
 	public void notifyLock(Collection<? extends EObject> elements) {
 		for (IAuthorityListener listener : listeners) {
diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java
@@ -21,8 +21,10 @@ public interface IExecutionCheckpoint {
 	/**
 	 * Tells if execution is allowed.
 	 * 
+	 * @param rs
+	 *            the {@link ResourceSet} to allow/forbid
 	 * @param allow
 	 *            if <code>true</code> execution is allowed, forbidden otherwise
 	 */
-	void allow(boolean allow);
+	void allow(ResourceSet rs, boolean allow);
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package org.gemoc.executionframework.engine.core;`
`2`	`2`
`3`	`3`	`import org.eclipse.emf.common.command.CommandStack;`
	`4`	`+import org.eclipse.emf.ecore.resource.ResourceSet;`
`4`	`5`	`import org.eclipse.emf.transaction.RecordingCommand;`
`5`	`6`	`import org.eclipse.emf.transaction.TransactionalEditingDomain;`
`6`	`7`	`import org.gemoc.xdsmlframework.api.core.IExecutionCheckpoint;`
`@@ -12,23 +13,23 @@ private CommandExecution() {`
`12`	`13`
`13`	`14`	`public static Object execute(TransactionalEditingDomain editingDomain, RecordingCommand command) {`
`14`	`15`	`final CommandStack commandStack = editingDomain.getCommandStack();`
`15`		`- IExecutionCheckpoint checkpoint = IExecutionCheckpoint.CHECKPOINTS.get(editingDomain.getResourceSet());`
	`16`	`+ ResourceSet rs = editingDomain.getResourceSet();`
	`17`	`+ IExecutionCheckpoint checkpoint = IExecutionCheckpoint.CHECKPOINTS.get(rs);`
`16`	`18`	`Object result = null;`
`17`	`19`	`try {`
`18`	`20`	`if (checkpoint != null) {`
`19`		`- checkpoint.allow(true);`
	`21`	`+ checkpoint.allow(rs, true);`
`20`	`22`	`}`
`21`	`23`	`commandStack.execute(command);`
`22`	`24`	`if (command.getResult() != null && command.getResult().size() == 1) {`
`23`	`25`	`result = command.getResult().iterator().next();`
`24`	`26`	`}`
`25`	`27`	`} finally {`
`26`	`28`	`if (checkpoint != null) {`
`27`		`- checkpoint.allow(false);`
	`29`	`+ checkpoint.allow(rs, false);`
`28`	`30`	`}`
`29`	`31`	`}`
`30`	`32`	`return result;`
`31`	`33`	`}`
`32`	`34`
`33`		`-`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,10 @@ public interface IExecutionCheckpoint {`
`21`	`21`	`/**`
`22`	`22`	`* Tells if execution is allowed.`
`23`	`23`	`*`
	`24`	`+ * @param rs`
	`25`	`+ * the {@link ResourceSet} to allow/forbid`
`24`	`26`	`* @param allow`
`25`	`27`	`* if <code>true</code> execution is allowed, forbidden otherwise`
`26`	`28`	`*/`
`27`		`- void allow(boolean allow);`
	`29`	`+ void allow(ResourceSet rs, boolean allow);`
`28`	`30`	`}`