https://bugzilla.redhat.com/show_bug.cgi?id=1149515 - Bpmn2 Diagram

Editor which comes with JBDS Integration Stack does not provide facility
of writing On Entry / On Exit scripts for custom service tasks

3 files changed, 6 insertions, 27 deletions

diff --git a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/ModelExtensionDescriptor.java b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/ModelExtensionDescriptor.java
index 10571c88..604c9896 100644
--- a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/ModelExtensionDescriptor.java
+++ b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/ModelExtensionDescriptor.java
@@ -551,7 +551,7 @@ public class ModelExtensionDescriptor extends BaseRuntimeDescriptor {
 	}
 	
 	private void addModelExtensionAdapter(EObject object) {
-		if (!object.eAdapters().contains(this))
+		if (getModelExtensionAdapter(object)==null)
 			object.eAdapters().add( new ModelExtensionAdapter(this) );
 	}
 }
diff --git a/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmCustomTaskDetailComposite.java b/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmCustomTaskDetailComposite.java
index b22b804e..076b817a 100644
--- a/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmCustomTaskDetailComposite.java
+++ b/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmCustomTaskDetailComposite.java
@@ -24,4 +24,9 @@ public class JbpmCustomTaskDetailComposite extends JbpmTaskDetailComposite {
 	public JbpmCustomTaskDetailComposite(AbstractBpmn2PropertySection section) {
 		super(section);
 	}
+
+	@Override
+	protected boolean isModelObjectEnabled(String className, String featureName) {
+		return !"anyAttribute".equals(featureName);
+	}
 }
diff --git a/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmTaskPropertySection.java b/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmTaskPropertySection.java
index 6d4178e5..511b4f02 100644
--- a/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmTaskPropertySection.java
+++ b/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmTaskPropertySection.java
@@ -13,18 +13,9 @@
 
 package org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.property;
 
-import java.util.List;
-
-import org.eclipse.bpmn2.Bpmn2Package;
 import org.eclipse.bpmn2.modeler.core.merrimac.clad.AbstractDetailComposite;
-import org.eclipse.bpmn2.modeler.core.utils.BusinessObjectUtil;
-import org.eclipse.bpmn2.modeler.core.utils.ModelUtil;
 import org.eclipse.bpmn2.modeler.ui.property.tasks.TaskPropertySection;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
 
 /**
  * @author Bob Brodt
@@ -33,23 +24,6 @@ import org.eclipse.ui.IWorkbenchPart;
 public class JbpmTaskPropertySection extends TaskPropertySection {
 
 	@Override
-	public boolean appliesTo(IWorkbenchPart part, ISelection selection) {
-		if (super.appliesTo(part, selection)) {
-			EObject object = BusinessObjectUtil.getBusinessObjectForSelection(selection);
-			if (object!=null && Bpmn2Package.eINSTANCE.getTask().isInstance(object)) {
-				List<EStructuralFeature> features = ModelUtil.getAnyAttributes(object);
-				for (EStructuralFeature f : features) {
-					if ("displayName".equals(f.getName())) //$NON-NLS-1$
-						// don't display this tab for Custom Tasks
-						return false;
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
 	protected AbstractDetailComposite createSectionRoot() {
 		return new JbpmTaskDetailComposite(this);
 	}