Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Brodt2015-02-13 13:10:48 -0500
committerBob Brodt2015-02-13 13:10:48 -0500
commitcd5b0748ce7b67aa285484d26f822f9e2afcb5c7 (patch)
treeb26d143297f80049bb929295584460d25f680ef4
parentb210de67e04fc78ed28e2804d569ac1de8a28e8a (diff)
downloadorg.eclipse.bpmn2-modeler-cd5b0748ce7b67aa285484d26f822f9e2afcb5c7.tar.gz
org.eclipse.bpmn2-modeler-cd5b0748ce7b67aa285484d26f822f9e2afcb5c7.tar.xz
org.eclipse.bpmn2-modeler-cd5b0748ce7b67aa285484d26f822f9e2afcb5c7.zip
Bug 455631 - User task actors label
https://bugzilla.redhat.com/show_bug.cgi?id=1189365 - isExecutable="false" should not be removed from BPMN file by BPMN 2 Diagram Editor
-rw-r--r--org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java9
-rw-r--r--org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/FormalExpressionPropertiesAdapter.java10
2 files changed, 18 insertions, 1 deletions
diff --git a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java
index 17d96752..0c96bb4a 100644
--- a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java
+++ b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java
@@ -26,6 +26,7 @@ import java.util.Map.Entry;
import org.eclipse.bpmn2.Assignment;
import org.eclipse.bpmn2.Bpmn2Factory;
import org.eclipse.bpmn2.Bpmn2Package;
+import org.eclipse.bpmn2.CompensateEventDefinition;
import org.eclipse.bpmn2.DataAssociation;
import org.eclipse.bpmn2.Definitions;
import org.eclipse.bpmn2.Documentation;
@@ -81,7 +82,6 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.BasicEObjectImpl;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EObjectWithInverseEList;
@@ -737,6 +737,13 @@ public class Bpmn2ModelerResourceImpl extends Bpmn2ResourceImpl {
return true;
}
+ if (o instanceof Process && f==Bpmn2Package.eINSTANCE.getProcess_IsExecutable())
+ return true;
+ if (o instanceof ItemDefinition && f==Bpmn2Package.eINSTANCE.getItemDefinition_IsCollection())
+ return true;
+ if (o instanceof CompensateEventDefinition && f==Bpmn2Package.eINSTANCE.getCompensateEventDefinition_WaitForCompletion())
+ return true;
+
// empty Expressions should not be saved
if (f!=null && (f.getEType() == Bpmn2Package.eINSTANCE.getExpression() ||
f.getEType() == Bpmn2Package.eINSTANCE.getFormalExpression())) {
diff --git a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/FormalExpressionPropertiesAdapter.java b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/FormalExpressionPropertiesAdapter.java
index 90ec50d0..71e5aedf 100644
--- a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/FormalExpressionPropertiesAdapter.java
+++ b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/FormalExpressionPropertiesAdapter.java
@@ -125,6 +125,16 @@ public class FormalExpressionPropertiesAdapter extends ExtendedPropertiesAdapter
public String getDisplayName(Object context) {
return getFeatureDescriptor(body).getDisplayName(context);
}
+
+ @Override
+ public String getLabel(Object context) {
+ FormalExpression expression = adopt(context);
+ if (expression.eContainer() instanceof SequenceFlow)
+ return Messages.FormalExpressionPropertiesAdapter_Condition;
+ if (object.eContainer() instanceof ResourceAssignmentExpression)
+ return Messages.FormalExpressionPropertiesAdapter_Actor;
+ return Messages.FormalExpressionPropertiesAdapter_Script;
+ }
});
}

Back to the top