Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Brodt2014-07-11 14:59:59 -0400
committerBob Brodt2014-07-11 14:59:59 -0400
commit94ca44bf9fdfe45e52429e1bee0e2e7dc4427395 (patch)
treee6dbb58c837c90c0495d8085027a92922470ddcf
parent538a72dcb573a60bd464601cfea63f8466dd22da (diff)
downloadorg.eclipse.bpmn2-modeler-94ca44bf9fdfe45e52429e1bee0e2e7dc4427395.tar.gz
org.eclipse.bpmn2-modeler-94ca44bf9fdfe45e52429e1bee0e2e7dc4427395.tar.xz
org.eclipse.bpmn2-modeler-94ca44bf9fdfe45e52429e1bee0e2e7dc4427395.zip
Fix the Data Input/Output/Associations mess for Send/Receive/Service
tasks
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/ModelUtil.java22
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/messages.properties4
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/messages.properties4
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/DataAssociationPropertiesAdapter.java58
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ReceiveTaskPropertiesAdapter.java1
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/SendTaskPropertiesAdapter.java2
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ServiceTaskPropertiesAdapter.java9
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/TaskPropertiesAdapter.java93
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/flow/DataAssociationFeatureContainer.java24
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties6
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/Messages.java4
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/messages.properties4
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/ActivityDetailComposite.java186
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/DataAssociationDetailComposite.java17
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoParameterMappingColumn.java147
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoParametersDetailComposite.java91
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoSetsListComposite.java8
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/Messages.java20
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/messages.properties22
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/util/PropertyUtil.java2
20 files changed, 302 insertions, 422 deletions
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/ModelUtil.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/ModelUtil.java
index ef6a2e77..3cece549 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/ModelUtil.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/ModelUtil.java
@@ -24,11 +24,15 @@ import org.eclipse.bpmn2.BaseElement;
import org.eclipse.bpmn2.Choreography;
import org.eclipse.bpmn2.ChoreographyActivity;
import org.eclipse.bpmn2.Collaboration;
+import org.eclipse.bpmn2.DataAssociation;
+import org.eclipse.bpmn2.DataInputAssociation;
+import org.eclipse.bpmn2.DataOutputAssociation;
import org.eclipse.bpmn2.Definitions;
import org.eclipse.bpmn2.DocumentRoot;
import org.eclipse.bpmn2.Event;
import org.eclipse.bpmn2.EventDefinition;
import org.eclipse.bpmn2.FormalExpression;
+import org.eclipse.bpmn2.ItemAwareElement;
import org.eclipse.bpmn2.Participant;
import org.eclipse.bpmn2.Process;
import org.eclipse.bpmn2.RootElement;
@@ -1112,6 +1116,24 @@ public class ModelUtil {
return null;
}
+ public static List<ItemAwareElement> getItemAwareElements(List<? extends DataAssociation> list) {
+ List<ItemAwareElement> result = new ArrayList<ItemAwareElement>();
+ for (DataAssociation da : list) {
+ if (da instanceof DataInputAssociation) {
+ for (ItemAwareElement e : da.getSourceRef()) {
+ if (e!=null)
+ result.add(e);
+ }
+ }
+ else if (da instanceof DataOutputAssociation) {
+ ItemAwareElement e = da.getTargetRef();
+ if (e!=null)
+ result.add(e);
+ }
+ }
+ return result;
+ }
+
// FIXME: update Switchyard to use new API
@Deprecated
public static List<EStructuralFeature> getAnyAttributes(EObject object) {
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/messages.properties b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/messages.properties
index d8198184..606b2fd5 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/messages.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/messages.properties
@@ -16,8 +16,8 @@ BPMN2ValidationConstraints_0=Process type must be either "Private" or "Public"
BPMN2ValidationConstraints_Missing_Connection={0} has no {1} Connections
BPMN2ValidationConstraints_Missing_Feature={0} has missing or incomplete {1}
BPMN2ValidationConstraints_Duplicate_Data_Type=The {0}{1} Data Type {2} is already defined
-BPMN2ValidationConstraints_Duplicate_Input=Input Parameter "{0}" is already defined
-BPMN2ValidationConstraints_Duplicate_Output=Output Parameter "{0}" is already defined
+BPMN2ValidationConstraints_Duplicate_Input=Input "{0}" is already defined
+BPMN2ValidationConstraints_Duplicate_Output=Output "{0}" is already defined
BPMN2ValidationConstraints_2=No targetNamespace defined
BPMN2ValidationConstraints_10=Converging Gateway must have multiple incoming Sequence Flows
diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/messages.properties b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/messages.properties
index a2feac43..e3653409 100644
--- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/messages.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/messages.properties
@@ -26,8 +26,8 @@ JbpmDefinitionsPropertySection_Name=Name
JbpmImportObjectEditor_Browse=Browse Types...
JbpmImportTypeDetailComposite_Title=Import
JbpmInterfacePropertySection_Import_Action=Import
-JbpmIoParametersDetailComposite_Input_Mapping_Title=Input Parameter Mapping
-JbpmIoParametersDetailComposite_Output_Mapping_Title=Output Parameter Mapping
+JbpmIoParametersDetailComposite_Input_Mapping_Title=Input Data Mapping
+JbpmIoParametersDetailComposite_Output_Mapping_Title=Output Data Mapping
JbpmScriptTaskDetailComposite_8=isForCompensation
JbpmScriptTaskDetailComposite_Script_Language=Script Language
JbpmTaskDetailComposite_Actors_Label=New Actor
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/DataAssociationPropertiesAdapter.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/DataAssociationPropertiesAdapter.java
index 230232a4..43e5f80c 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/DataAssociationPropertiesAdapter.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/DataAssociationPropertiesAdapter.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.eclipse.bpmn2.Activity;
import org.eclipse.bpmn2.Bpmn2Package;
import org.eclipse.bpmn2.CallableElement;
-import org.eclipse.bpmn2.CategoryValue;
+import org.eclipse.bpmn2.CatchEvent;
import org.eclipse.bpmn2.DataAssociation;
import org.eclipse.bpmn2.DataInput;
import org.eclipse.bpmn2.DataInputAssociation;
@@ -37,8 +37,8 @@ import org.eclipse.bpmn2.InputOutputSpecification;
import org.eclipse.bpmn2.ItemAwareElement;
import org.eclipse.bpmn2.Process;
import org.eclipse.bpmn2.Property;
+import org.eclipse.bpmn2.ThrowEvent;
import org.eclipse.bpmn2.di.BPMNShape;
-import org.eclipse.bpmn2.modeler.core.adapters.AdapterUtil;
import org.eclipse.bpmn2.modeler.core.adapters.ExtendedPropertiesAdapter;
import org.eclipse.bpmn2.modeler.core.adapters.FeatureDescriptor;
import org.eclipse.bpmn2.modeler.core.features.GraphitiConstants;
@@ -55,8 +55,6 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.graphiti.features.IAddFeature;
import org.eclipse.graphiti.features.IDeleteFeature;
import org.eclipse.graphiti.features.IFeatureProvider;
@@ -80,6 +78,8 @@ import org.eclipse.graphiti.ui.editor.DiagramEditor;
*/
public class DataAssociationPropertiesAdapter extends ExtendedPropertiesAdapter<DataAssociation> {
+ public final static String UI_SHOW_ITEMS_IN_SCOPE = "show.items.in.scope";
+
/**
* @param adapterFactory
* @param object
@@ -117,7 +117,7 @@ public class DataAssociationPropertiesAdapter extends ExtendedPropertiesAdapter<
return Messages.DataAssociationPropertiesAdapter_Source;
return Messages.DataAssociationPropertiesAdapter_Target;
}
-
+
@Override
public Hashtable<String, Object> getChoiceOfValues() {
List<EObject> values = new ArrayList<EObject>();
@@ -125,34 +125,34 @@ public class DataAssociationPropertiesAdapter extends ExtendedPropertiesAdapter<
// Properties are contained in the nearest enclosing Process or Event;
// DataStores are contained in the DocumentRoot
EObject container = ModelUtil.getContainer(object);
- values.addAll( ModelUtil.collectAncestorObjects(container, "properties", new Class[] {Activity.class}) ); //$NON-NLS-1$
- values.addAll( ModelUtil.collectAncestorObjects(container, "properties", new Class[] {Process.class}) ); //$NON-NLS-1$
- values.addAll( ModelUtil.collectAncestorObjects(container, "properties", new Class[] {Event.class}) ); //$NON-NLS-1$
- values.addAll( ModelUtil.collectAncestorObjects(container, "dataStore", new Class[] {DocumentRoot.class}) ); //$NON-NLS-1$
- values.addAll( ModelUtil.collectAncestorObjects(container, "flowElements", new Class[] {FlowElementsContainer.class}, new Class[] {ItemAwareElement.class})); //$NON-NLS-1$
- Activity activity = (Activity)ModelUtil.findNearestAncestor(container, new Class[] {Activity.class});
- if (activity!=null) {
- InputOutputSpecification ioSpec = activity.getIoSpecification();
- if (ioSpec!=null) {
- if (object instanceof DataInputAssociation)
- values.addAll(ioSpec.getDataInputs());
- else
- values.addAll(ioSpec.getDataOutputs());
- }
+ Object p = owner.getProperty(UI_SHOW_ITEMS_IN_SCOPE);
+ if (p instanceof Boolean && (Boolean)p) {
+ values.addAll( ModelUtil.collectAncestorObjects(container, "properties", new Class[] {Activity.class}) ); //$NON-NLS-1$
+ values.addAll( ModelUtil.collectAncestorObjects(container, "properties", new Class[] {Process.class}) ); //$NON-NLS-1$
+ values.addAll( ModelUtil.collectAncestorObjects(container, "properties", new Class[] {Event.class}) ); //$NON-NLS-1$
+ values.addAll( ModelUtil.collectAncestorObjects(container, "dataStore", new Class[] {DocumentRoot.class}) ); //$NON-NLS-1$
+ values.addAll( ModelUtil.collectAncestorObjects(container, "flowElements", new Class[] {FlowElementsContainer.class}, new Class[] {ItemAwareElement.class})); //$NON-NLS-1$
}
-
- CallableElement callable = (CallableElement)ModelUtil.findNearestAncestor(container, new Class[] {CallableElement.class});
- if (callable!=null) {
- InputOutputSpecification ioSpec = callable.getIoSpecification();
- if (ioSpec!=null) {
- if (object instanceof DataInputAssociation)
- values.addAll(ioSpec.getDataInputs());
- else
- values.addAll(ioSpec.getDataOutputs());
+ else {
+ if (container instanceof Activity) {
+ Activity activity = (Activity)container;
+ if (object instanceof DataInputAssociation) {
+ values.addAll(ModelUtil.getItemAwareElements(activity.getDataInputAssociations()));
+ }
+ else {
+ values.addAll(ModelUtil.getItemAwareElements(activity.getDataOutputAssociations()));
+ }
+ }
+ else if (container instanceof ThrowEvent) {
+ ThrowEvent event = (ThrowEvent)container;
+ values.addAll(ModelUtil.getItemAwareElements(event.getDataInputAssociation()));
+ }
+ else if (container instanceof CatchEvent) {
+ CatchEvent event = (CatchEvent)container;
+ values.addAll(ModelUtil.getItemAwareElements(event.getDataOutputAssociation()));
}
}
-
super.setChoiceOfValues(values);
return super.getChoiceOfValues();
}
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ReceiveTaskPropertiesAdapter.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ReceiveTaskPropertiesAdapter.java
index 6871731c..b9e57685 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ReceiveTaskPropertiesAdapter.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ReceiveTaskPropertiesAdapter.java
@@ -104,7 +104,6 @@ public class ReceiveTaskPropertiesAdapter extends TaskPropertiesAdapter<ReceiveT
}
}
}
- fixDataOutputs(receiveTask, message);
}
}
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/SendTaskPropertiesAdapter.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/SendTaskPropertiesAdapter.java
index a6cf0682..4f48c99f 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/SendTaskPropertiesAdapter.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/SendTaskPropertiesAdapter.java
@@ -104,8 +104,6 @@ public class SendTaskPropertiesAdapter extends TaskPropertiesAdapter<SendTask> {
}
}
}
-
- fixDataInputs(sendTask, message);
}
}
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ServiceTaskPropertiesAdapter.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ServiceTaskPropertiesAdapter.java
index e73a32aa..0e62ef29 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ServiceTaskPropertiesAdapter.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ServiceTaskPropertiesAdapter.java
@@ -17,7 +17,6 @@ import java.util.Hashtable;
import java.util.Map.Entry;
import org.eclipse.bpmn2.Bpmn2Package;
-import org.eclipse.bpmn2.Message;
import org.eclipse.bpmn2.Operation;
import org.eclipse.bpmn2.ServiceTask;
import org.eclipse.bpmn2.modeler.core.adapters.FeatureDescriptor;
@@ -93,14 +92,6 @@ public class ServiceTaskPropertiesAdapter extends TaskPropertiesAdapter<ServiceT
private void setOperationRef(ServiceTask serviceTask, Operation operation) {
if (serviceTask.getOperationRef()!=operation) {
serviceTask.setOperationRef(operation);
- if (operation!=null) {
- fixDataInputs(serviceTask, operation.getInMessageRef());
- fixDataOutputs(serviceTask, operation.getOutMessageRef());
- }
- else {
- fixDataInputs(serviceTask, null);
- fixDataOutputs(serviceTask, null);
- }
}
}
}
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/TaskPropertiesAdapter.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/TaskPropertiesAdapter.java
index 8a381f7f..f14cb9c2 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/TaskPropertiesAdapter.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/TaskPropertiesAdapter.java
@@ -13,19 +13,8 @@
package org.eclipse.bpmn2.modeler.ui.adapters.properties;
-import java.util.ArrayList;
-import java.util.List;
-
import org.eclipse.bpmn2.Bpmn2Package;
-import org.eclipse.bpmn2.DataAssociation;
-import org.eclipse.bpmn2.DataInputAssociation;
-import org.eclipse.bpmn2.DataOutputAssociation;
-import org.eclipse.bpmn2.InputOutputSpecification;
-import org.eclipse.bpmn2.ItemAwareElement;
-import org.eclipse.bpmn2.ItemDefinition;
-import org.eclipse.bpmn2.Message;
import org.eclipse.bpmn2.Task;
-import org.eclipse.bpmn2.modeler.core.adapters.ExtendedPropertiesAdapter;
import org.eclipse.emf.common.notify.AdapterFactory;
/**
@@ -43,86 +32,4 @@ public class TaskPropertiesAdapter<T extends Task> extends ActivityPropertiesAda
setProperty(Bpmn2Package.eINSTANCE.getInteractionNode_IncomingConversationLinks(), UI_CAN_CREATE_NEW, Boolean.FALSE);
setProperty(Bpmn2Package.eINSTANCE.getInteractionNode_OutgoingConversationLinks(), UI_CAN_CREATE_NEW, Boolean.FALSE);
}
-
- private static boolean typesEqual(ItemDefinition i1, ItemDefinition i2) {
- if (i1==i2)
- return true;
- if (i1==null) {
- if (i2==null)
- return true;
- return false;
- }
- if (i2==null) {
- return false;
- }
- return i1.equals(i2);
- }
-
- protected static void fixDataInputs(Task activity, Message message) {
- // try to match up the given Message data type with one of the
- // Input Association types.
- ItemDefinition messageType = null;
- if (message!=null)
- messageType = message.getItemRef();
- for (DataInputAssociation dia : activity.getDataInputAssociations()) {
- for (ItemAwareElement e : dia.getSourceRef()) {
- ItemDefinition inputType = e.getItemSubjectRef();
- if (typesEqual(messageType, inputType)) {
- return;
- }
- }
- }
- clearDataInputs(activity);
- }
-
- protected static void clearDataInputs(Task activity) {
- List<DataAssociation> deletedAssociations = new ArrayList<DataAssociation>();
- deletedAssociations.addAll(activity.getDataInputAssociations());
- for (DataAssociation da : deletedAssociations) {
- // we can delete the connection line by simply setting either the source
- // or target of the DataAssociation to null
- ExtendedPropertiesAdapter adapter = ExtendedPropertiesAdapter.adapt(da);
- adapter.getFeatureDescriptor(Bpmn2Package.eINSTANCE.getDataAssociation_SourceRef()).setValue(null);
- }
- activity.getDataInputAssociations().clear();
- InputOutputSpecification ioSpec = activity.getIoSpecification();
- if (ioSpec!=null) {
- ioSpec.getDataInputs().clear();
- ioSpec.getInputSets().get(0).getDataInputRefs().clear();
- }
- }
-
- protected static void fixDataOutputs(Task activity, Message message) {
- // try to match up the given Message data type with one of the
- // Output Association types.
- ItemDefinition messageType = null;
- if (message!=null)
- messageType = message.getItemRef();
- for (DataOutputAssociation doa : activity.getDataOutputAssociations()) {
- ItemAwareElement e = doa.getTargetRef();
- ItemDefinition inputType = e.getItemSubjectRef();
- if (typesEqual(messageType, inputType)) {
- return;
- }
- }
- clearDataOutputs(activity);
- }
-
- protected static void clearDataOutputs(Task activity) {
- // we need to delete the existing Data Associations along with their visuals
- List<DataAssociation> deletedAssociations = new ArrayList<DataAssociation>();
- deletedAssociations.addAll(activity.getDataOutputAssociations());
- for (DataAssociation da : deletedAssociations) {
- // we can delete the connection line by simply setting either the source
- // or target of the DataAssociation to null
- ExtendedPropertiesAdapter adapter = ExtendedPropertiesAdapter.adapt(da);
- adapter.getFeatureDescriptor(Bpmn2Package.eINSTANCE.getDataAssociation_SourceRef()).setValue(null);
- }
- activity.getDataOutputAssociations().clear();
- InputOutputSpecification ioSpec = activity.getIoSpecification();
- if (ioSpec!=null) {
- ioSpec.getDataOutputs().clear();
- ioSpec.getOutputSets().get(0).getDataOutputRefs().clear();
- }
- }
}
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/flow/DataAssociationFeatureContainer.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/flow/DataAssociationFeatureContainer.java
index 2dddf3c6..70eb0a14 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/flow/DataAssociationFeatureContainer.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/flow/DataAssociationFeatureContainer.java
@@ -231,12 +231,12 @@ public class DataAssociationFeatureContainer extends BaseElementConnectionFeatur
DataInput result = null;
DataInput dataInput = null;
- if (target instanceof SendTask || target instanceof ReceiveTask || target instanceof ServiceTask) {
- // don't create a new Data Input/Output for these types of tasks if
- // they already have one
- if (dataInputs.size()>0)
- result = dataInputs.get(0);
- }
+// if (target instanceof SendTask || target instanceof ReceiveTask || target instanceof ServiceTask) {
+// // don't create a new Data Input/Output for these types of tasks if
+// // they already have one
+// if (dataInputs.size()>0)
+// result = dataInputs.get(0);
+// }
if (result==null) {
// allow user to select a dataInput:
@@ -310,12 +310,12 @@ public class DataAssociationFeatureContainer extends BaseElementConnectionFeatur
DataOutput result = null;
DataOutput dataOutput = null;
- if (source instanceof SendTask || source instanceof ReceiveTask || source instanceof ServiceTask) {
- // don't create a new Data Input/Output for these types of tasks if
- // they already have one
- if (dataOutputs.size()>0)
- result = dataOutputs.get(0);
- }
+// if (source instanceof SendTask || source instanceof ReceiveTask || source instanceof ServiceTask) {
+// // don't create a new Data Input/Output for these types of tasks if
+// // they already have one
+// if (dataOutputs.size()>0)
+// result = dataOutputs.get(0);
+// }
if (result==null) {
// allow user to select a dataOutput:
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties
index afdbd75c..0cc3405a 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties
@@ -308,13 +308,13 @@ UI_Any_isForCompensation_description = \
If true, this Activity is only activated when a Compensation Event is\n\
detected and initiated under Compensation Event visibility scope
UI_DataInput_name_description = \
- Name of the Input Parameter to which a Process variable\n\
+ Name of the Input Data Item to which a Process variable\n\
or expression is assigned before the activity is executed.
UI_DataInputAssociation_sourceRef_description = \
- A Process variable assigned to the activity's Input Parameter\n\
+ A Process variable assigned to the activity's Input Data Item\n\
before the activity is executed
UI_DataOutput_name_description = \
- Name of the Output Parameter containing the results of the activity (if any).\n\
+ Name of the Output Data Item containing the results of the activity (if any).\n\
The results are assigned to a Process variable before execution of the Process continues.
UI_DataOutputAssociation_targetRef_description = \
A Process variable to which the activity's results (if any) are assigned.
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/Messages.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/Messages.java
index 0f6a480b..41399791 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/Messages.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/Messages.java
@@ -16,8 +16,8 @@ public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.bpmn2.modeler.ui.property.events.messages"; //$NON-NLS-1$
public static String CommonEventDetailComposite_Attached_To_Label;
public static String CommonEventDetailComposite_Event_Definition_Title;
- public static String CommonEventDetailComposite_Input_Parameters_Title;
- public static String CommonEventDetailComposite_Output_Parameters_Title;
+ public static String CommonEventDetailComposite_Input_Data_Title;
+ public static String CommonEventDetailComposite_Output_Data_Title;
public static String EventDefinitionsListComposite_Event_ID_Header;
public static String EventDefinitionsListComposite_Event_Type_Header;
public static String EventDefinitionsListComposite_Map_Incoming;
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/messages.properties b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/messages.properties
index 935d7e9c..3d18adff 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/messages.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/messages.properties
@@ -10,8 +10,8 @@
#-------------------------------------------------------------------------------
CommonEventDetailComposite_Attached_To_Label=Attached To
CommonEventDetailComposite_Event_Definition_Title=Event Definitions
-CommonEventDetailComposite_Input_Parameters_Title=Input Parameters
-CommonEventDetailComposite_Output_Parameters_Title=Output Parameters
+CommonEventDetailComposite_Input_Data_Title=Input Data
+CommonEventDetailComposite_Output_Data_Title=Output Data
EventDefinitionsListComposite_Event_ID_Header=Event ID
EventDefinitionsListComposite_Event_Type_Header=Event Type
EventDefinitionsListComposite_Map_Incoming=Map Incoming {0} Data To:
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/ActivityDetailComposite.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/ActivityDetailComposite.java
index 0671ac6e..38b37a16 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/ActivityDetailComposite.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/ActivityDetailComposite.java
@@ -14,25 +14,20 @@
package org.eclipse.bpmn2.modeler.ui.property.tasks;
-import java.util.ArrayList;
-import java.util.List;
-
import org.eclipse.bpmn2.Activity;
import org.eclipse.bpmn2.BaseElement;
import org.eclipse.bpmn2.Bpmn2Package;
import org.eclipse.bpmn2.CallableElement;
import org.eclipse.bpmn2.Choreography;
import org.eclipse.bpmn2.Collaboration;
-import org.eclipse.bpmn2.DataAssociation;
import org.eclipse.bpmn2.DataInput;
import org.eclipse.bpmn2.DataOutput;
import org.eclipse.bpmn2.Definitions;
import org.eclipse.bpmn2.InputOutputSpecification;
import org.eclipse.bpmn2.InputSet;
-import org.eclipse.bpmn2.InteractionNode;
+import org.eclipse.bpmn2.ItemDefinition;
import org.eclipse.bpmn2.LoopCharacteristics;
import org.eclipse.bpmn2.Message;
-import org.eclipse.bpmn2.MessageFlow;
import org.eclipse.bpmn2.MultiInstanceLoopCharacteristics;
import org.eclipse.bpmn2.Operation;
import org.eclipse.bpmn2.OutputSet;
@@ -41,7 +36,6 @@ import org.eclipse.bpmn2.ReceiveTask;
import org.eclipse.bpmn2.SendTask;
import org.eclipse.bpmn2.ServiceTask;
import org.eclipse.bpmn2.StandardLoopCharacteristics;
-import org.eclipse.bpmn2.Task;
import org.eclipse.bpmn2.di.BPMNDiagram;
import org.eclipse.bpmn2.di.BPMNPlane;
import org.eclipse.bpmn2.di.BpmnDiFactory;
@@ -63,14 +57,6 @@ import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.graphiti.features.IDeleteFeature;
-import org.eclipse.graphiti.features.IFeatureProvider;
-import org.eclipse.graphiti.features.context.IDeleteContext;
-import org.eclipse.graphiti.features.context.impl.DeleteContext;
-import org.eclipse.graphiti.mm.pictograms.Connection;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.services.Graphiti;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -440,17 +426,17 @@ public class ActivityDetailComposite extends DefaultDetailComposite {
activityAdapter.getFeatureDescriptor(messageRef).setValue(message);
}
- if (container!=null) {
- if (inputComposite==null) {
- inputComposite = new DataAssociationDetailComposite(container, SWT.NONE);
- inputComposite.setShowToGroup(false);
- }
-
- if (outputComposite==null) {
- outputComposite = new DataAssociationDetailComposite(container, SWT.NONE);
- outputComposite.setShowFromGroup(false);
- }
+ if (inputComposite==null) {
+ inputComposite = new DataAssociationDetailComposite(container, SWT.NONE);
+ inputComposite.setShowToGroup(false);
}
+// inputComposite.setShowItemsInScope(false);
+
+ if (outputComposite==null) {
+ outputComposite = new DataAssociationDetailComposite(container, SWT.NONE);
+ outputComposite.setShowFromGroup(false);
+ }
+// outputComposite.setShowItemsInScope(false);
Resource resource = activity.eResource();
InputOutputSpecification ioSpec = activity.getIoSpecification();
@@ -511,40 +497,64 @@ public class ActivityDetailComposite extends DefaultDetailComposite {
if (inMessage!=null) {
// display the "From" association widgets
- input = Bpmn2ModelerFactory.create(resource, DataInput.class);
- if (inMessage.getItemRef()!=null) {
- input.setItemSubjectRef(inMessage.getItemRef());
- input.setIsCollection(inMessage.getItemRef().isIsCollection());
- }
- if (operationChanged || messageChanged || ioSpec.eContainer()==null)
- {
- ioSpec.getDataInputs().add(input);
- ioSpec.getInputSets().get(0).getDataInputRefs().add(input);
+ boolean newInput = false;
+ if (ioSpec.getDataInputs().size()>0) {
+ input = ioSpec.getDataInputs().get(0);
}
else {
- InsertionAdapter.add(ioSpec,
- Bpmn2Package.eINSTANCE.getInputOutputSpecification_DataInputs(), input);
- InsertionAdapter.add(ioSpec.getInputSets().get(0),
- Bpmn2Package.eINSTANCE.getInputSet_DataInputRefs(), input);
+ input = Bpmn2ModelerFactory.create(resource, DataInput.class);
+ newInput = true;
+ }
+ if (operationChanged || messageChanged) {
+ ItemDefinition id = inMessage.getItemRef();
+ if (id!=null && id!=input.getItemSubjectRef()) {
+ input.setItemSubjectRef(id);
+ input.setIsCollection(id.isIsCollection());
+ }
+ }
+ if (newInput) {
+ if (operationChanged || messageChanged || ioSpec.eContainer()==null)
+ {
+ ioSpec.getDataInputs().add(input);
+ ioSpec.getInputSets().get(0).getDataInputRefs().add(input);
+ }
+ else {
+ InsertionAdapter.add(ioSpec,
+ Bpmn2Package.eINSTANCE.getInputOutputSpecification_DataInputs(), input);
+ InsertionAdapter.add(ioSpec.getInputSets().get(0),
+ Bpmn2Package.eINSTANCE.getInputSet_DataInputRefs(), input);
+ }
}
}
if (outMessage!=null) {
- output = Bpmn2ModelerFactory.create(resource, DataOutput.class);
- if (outMessage.getItemRef()!=null) {
- output.setItemSubjectRef(outMessage.getItemRef());
- output.setIsCollection(outMessage.getItemRef().isIsCollection());
- }
- if (operationChanged || messageChanged ||ioSpec.eContainer()==null)
- {
- ioSpec.getDataOutputs().add(output);
- ioSpec.getOutputSets().get(0).getDataOutputRefs().add(output);
+ boolean newOutput = false;
+ if (ioSpec.getDataOutputs().size()>0) {
+ output = ioSpec.getDataOutputs().get(0);
}
else {
- InsertionAdapter.add(ioSpec,
- Bpmn2Package.eINSTANCE.getInputOutputSpecification_DataOutputs(), output);
- InsertionAdapter.add(ioSpec.getOutputSets().get(0),
- Bpmn2Package.eINSTANCE.getOutputSet_DataOutputRefs(), output);
+ output = Bpmn2ModelerFactory.create(resource, DataOutput.class);
+ newOutput = true;
+ }
+ if (operationChanged || messageChanged) {
+ ItemDefinition id = outMessage.getItemRef();
+ if (id!=null && id!=input.getItemSubjectRef()) {
+ output.setItemSubjectRef(id);
+ output.setIsCollection(id.isIsCollection());
+ }
+ }
+ if (newOutput) {
+ if (operationChanged || messageChanged ||ioSpec.eContainer()==null)
+ {
+ ioSpec.getDataOutputs().add(output);
+ ioSpec.getOutputSets().get(0).getDataOutputRefs().add(output);
+ }
+ else {
+ InsertionAdapter.add(ioSpec,
+ Bpmn2Package.eINSTANCE.getInputOutputSpecification_DataOutputs(), output);
+ InsertionAdapter.add(ioSpec.getOutputSets().get(0),
+ Bpmn2Package.eINSTANCE.getOutputSet_DataOutputRefs(), output);
+ }
}
}
@@ -565,7 +575,7 @@ public class ActivityDetailComposite extends DefaultDetailComposite {
}
if (ioSpec.getDataOutputs().size()>0) {
output = ioSpec.getDataOutputs().get(0);
- // fix missing InputSet
+ // fix missing OutputSet
final OutputSet outputSet = ioSpec.getOutputSets().get(0);
if (!outputSet.getDataOutputRefs().contains(output)) {
final DataOutput o = output;
@@ -584,47 +594,45 @@ public class ActivityDetailComposite extends DefaultDetailComposite {
InsertionAdapter.add(activity, Bpmn2Package.eINSTANCE.getActivity_IoSpecification(), ioSpec);
}
- if (container!=null) {
- if (activity instanceof ServiceTask) {
- if (inMessage!=null) {
- // display the "From" association widgets
- inputComposite.setVisible(true);
- inputComposite.setBusinessObject(input);
- inputComposite.getFromGroup().setText(Messages.ActivityDetailComposite_Map_Request_Message);
- }
- else
- inputComposite.setVisible(false);
-
- if (outMessage!=null) {
- outputComposite.setVisible(true);
- outputComposite.setBusinessObject(output);
- outputComposite.getToGroup().setText(Messages.ActivityDetailComposite_Map_Response_Message);
- }
- else
- outputComposite.setVisible(false);
+ if (activity instanceof ServiceTask) {
+ if (inMessage!=null) {
+ // display the "From" association widgets
+ inputComposite.setVisible(true);
+ inputComposite.setBusinessObject(input);
+ inputComposite.getFromGroup().setText(Messages.ActivityDetailComposite_Map_Request_Message);
}
- else if (activity instanceof SendTask) {
- if (inMessage!=null) {
- inputComposite.setVisible(true);
- inputComposite.setBusinessObject(input);
- inputComposite.getFromGroup().setText(Messages.ActivityDetailComposite_Map_Outgoing_Message);
- }
- else
- inputComposite.setVisible(false);
+ else
+ inputComposite.setVisible(false);
+
+ if (outMessage!=null) {
+ outputComposite.setVisible(true);
+ outputComposite.setBusinessObject(output);
+ outputComposite.getToGroup().setText(Messages.ActivityDetailComposite_Map_Response_Message);
}
- else if (activity instanceof ReceiveTask) {
- if (outMessage!=null) {
- outputComposite.setVisible(true);
- outputComposite.setBusinessObject(output);
- outputComposite.getToGroup().setText(Messages.ActivityDetailComposite_Map_Incoming_Message);
- }
- else
- outputComposite.setVisible(false);
+ else
+ outputComposite.setVisible(false);
+ }
+ else if (activity instanceof SendTask) {
+ if (inMessage!=null) {
+ inputComposite.setVisible(true);
+ inputComposite.setBusinessObject(input);
+ inputComposite.getFromGroup().setText(Messages.ActivityDetailComposite_Map_Outgoing_Message);
}
-
- if (operationChanged || messageChanged) {
- redrawPage();
+ else
+ inputComposite.setVisible(false);
+ }
+ else if (activity instanceof ReceiveTask) {
+ if (outMessage!=null) {
+ outputComposite.setVisible(true);
+ outputComposite.setBusinessObject(output);
+ outputComposite.getToGroup().setText(Messages.ActivityDetailComposite_Map_Incoming_Message);
}
+ else
+ outputComposite.setVisible(false);
+ }
+
+ if (operationChanged || messageChanged) {
+ redrawPage();
}
}
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/DataAssociationDetailComposite.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/DataAssociationDetailComposite.java
index 591394a4..87839678 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/DataAssociationDetailComposite.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/DataAssociationDetailComposite.java
@@ -29,6 +29,7 @@ import org.eclipse.bpmn2.InputOutputSpecification;
import org.eclipse.bpmn2.ItemAwareElement;
import org.eclipse.bpmn2.MultiInstanceLoopCharacteristics;
import org.eclipse.bpmn2.ThrowEvent;
+import org.eclipse.bpmn2.modeler.core.adapters.ExtendedPropertiesAdapter;
import org.eclipse.bpmn2.modeler.core.adapters.ExtendedPropertiesProvider;
import org.eclipse.bpmn2.modeler.core.adapters.InsertionAdapter;
import org.eclipse.bpmn2.modeler.core.merrimac.clad.AbstractBpmn2PropertySection;
@@ -42,6 +43,7 @@ import org.eclipse.bpmn2.modeler.core.merrimac.clad.TableColumn;
import org.eclipse.bpmn2.modeler.core.merrimac.dialogs.ComboObjectEditor;
import org.eclipse.bpmn2.modeler.core.merrimac.dialogs.ObjectEditor;
import org.eclipse.bpmn2.modeler.core.utils.ModelUtil;
+import org.eclipse.bpmn2.modeler.ui.adapters.properties.DataAssociationPropertiesAdapter;
import org.eclipse.bpmn2.modeler.ui.property.data.ItemAwareElementDetailComposite;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
@@ -112,6 +114,7 @@ public class DataAssociationDetailComposite extends ItemAwareElementDetailCompos
protected boolean updatingWidgets;
protected boolean showFromGroup = true;
+ protected boolean showItemsInScope = true;
protected Group fromGroup;
protected boolean showToGroup = true;
protected Group toGroup;
@@ -235,7 +238,7 @@ public class DataAssociationDetailComposite extends ItemAwareElementDetailCompos
}
DataInputOutputDetailComposite details = createDataInputOutputDetailComposite(be, group,SWT.NONE);
details.setBusinessObject(be);
- sectionTitle = (isInput ? Messages.DataAssociationDetailComposite_Input_Parameter_Mapping_Title : Messages.DataAssociationDetailComposite_Output_Parameter_Mapping_Title);
+ sectionTitle = (isInput ? Messages.DataAssociationDetailComposite_Input_Data_Mapping_Title : Messages.DataAssociationDetailComposite_Output_Data_Mapping_Title);
}
else if (container instanceof ThrowEvent) {
ThrowEvent throwEvent = (ThrowEvent)container;
@@ -318,6 +321,10 @@ public class DataAssociationDetailComposite extends ItemAwareElementDetailCompos
return toGroup;
}
+ public void setShowItemsInScope(boolean showItemsInScope) {
+ this.showItemsInScope = showItemsInScope;
+ }
+
public void setShowFromGroup(boolean showFromGroup) {
this.showFromGroup = showFromGroup;
}
@@ -554,7 +561,7 @@ public class DataAssociationDetailComposite extends ItemAwareElementDetailCompos
Group group = !isInput ? toGroup : fromGroup;
if (mapPropertyButton==null) {
- mapPropertyButton = toolkit.createButton(group, Messages.DataAssociationDetailComposite_Variable_Button, SWT.RADIO);
+ mapPropertyButton = toolkit.createButton(group, Messages.DataAssociationDetailComposite_DataItem_Button, SWT.RADIO);
mapPropertyButton.setLayoutData(new GridData(SWT.LEFT,SWT.TOP,true,false,3,1));
mapPropertyButton.addSelectionListener(new SelectionAdapter() {
@@ -706,6 +713,10 @@ public class DataAssociationDetailComposite extends ItemAwareElementDetailCompos
@Override
protected void bindReference(Composite parent, EObject object, EReference reference) {
+ ExtendedPropertiesAdapter adapter = ExtendedPropertiesAdapter.adapt(object);
+ adapter.setProperty(
+ DataAssociationPropertiesAdapter.UI_SHOW_ITEMS_IN_SCOPE,
+ new Boolean(showItemsInScope));
String displayName = ExtendedPropertiesProvider.getLabel(object, reference);
ObjectEditor editor = new ComboObjectEditor(this,object,reference);
editor.createControl(parent,displayName);
@@ -716,7 +727,7 @@ public class DataAssociationDetailComposite extends ItemAwareElementDetailCompos
}
};
propertyDetailsComposite.setBusinessObject(association);
- propertyDetailsComposite.setTitle(Messages.DataAssociationDetailComposite_Variables_Title);
+ propertyDetailsComposite.setTitle(Messages.DataAssociationDetailComposite_DataItems_Title);
}
}
else {
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoParameterMappingColumn.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoParameterMappingColumn.java
index 8c002b9b..39d2e1b9 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoParameterMappingColumn.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoParameterMappingColumn.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.bpmn2.modeler.ui.property.tasks;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.bpmn2.Activity;
@@ -28,10 +29,6 @@ import org.eclipse.bpmn2.modeler.core.adapters.ExtendedPropertiesProvider;
import org.eclipse.bpmn2.modeler.core.merrimac.clad.TableColumn;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.swt.widgets.Composite;
public class IoParameterMappingColumn extends TableColumn {
@@ -56,13 +53,19 @@ public class IoParameterMappingColumn extends TableColumn {
@Override
public String getText(Object element) {
- String text = null;
+ String result = null;
ItemAwareElement source = (ItemAwareElement)element;
- DataAssociation da = getDataAssociation(source);
- if (da!=null) {
- ItemAwareElement target = getTargetElement(da);
- if (target!=null)
- text = ExtendedPropertiesProvider.getTextValue(target);
+ for (DataAssociation da : getDataAssociations(source)) {
+ String text = null;
+ List<ItemAwareElement> target = getTargetElements(da);
+ if (!target.isEmpty())
+ for (ItemAwareElement e : target) {
+ if (text==null)
+ text = "";
+ else
+ text += ", ";
+ text += ExtendedPropertiesProvider.getTextValue(e);
+ }
else {
if (da.getTransformation()!=null) {
text = Messages.IoParameterMappingColumn_Transform_Prefix + ExtendedPropertiesProvider.getTextValue(da.getTransformation());
@@ -83,89 +86,40 @@ public class IoParameterMappingColumn extends TableColumn {
text += " + " + text2; //$NON-NLS-1$
}
}
+ if (text!=null && !text.isEmpty()) {
+ if (result==null)
+ result = "";
+ else
+ result += ", ";
+ result += text;
+ }
}
- return text==null ? "" : text; //$NON-NLS-1$
+ return result==null ? "" : result; //$NON-NLS-1$
}
private FormalExpression getTargetExpression(DataAssociation da, Assignment assign) {
return (FormalExpression) ((da instanceof DataInputAssociation) ? assign.getFrom() : assign.getTo());
}
- @Override
- public Object getValue(Object element, String property) {
- Integer value = new Integer(-1);
- ItemAwareElement source = (ItemAwareElement)element;
- DataAssociation da = getDataAssociation(source);
- if (da!=null) {
- ItemAwareElement target = getTargetElement(da);
- association = da;
- EStructuralFeature f = getTargetFeature(source);
- CellEditor ce = getCellEditor();
- if (ce instanceof CustomComboBoxCellEditor) {
- ((CustomComboBoxCellEditor)ce).setValue(da,f,target);
- value = (Integer)getCellEditor().getValue();
- }
- }
- return value;
- }
-
- @Override
- public CellEditor createCellEditor(Composite parent) {
- return new CustomComboBoxCellEditor(parent, feature) {
-
- public void activate(ColumnViewerEditorActivationEvent activationEvent) {
- Object activationSource = activationEvent.getSource();
- if (activationSource instanceof ViewerCell) {
- Object element = ((ViewerCell)activationSource).getElement();
- if (element instanceof ItemAwareElement) {
- ItemAwareElement source = (ItemAwareElement)element;
- DataAssociation da = getDataAssociation(source);
- if (da!=null) {
- ItemAwareElement target = getTargetElement(da);
- association = da;
- EStructuralFeature f = getTargetFeature(source);
- setValue(da,f,target);
- }
- }
- }
- }
- };
- }
-
- @Override
- public boolean canModify(Object element, String property) {
- if (super.canModify(element, property)) {
- // only allow the combobox cell editor to work if the DataAssociation is
- // with a Property (no MultipleAssignments or Transformations please!)
- // Other types of associations must be done in the Detail section
- DataAssociation da = getDataAssociation((ItemAwareElement)element);
- if (da!= null) {
- if (getTargetElement(da) == null) {
- if (!da.getAssignment().isEmpty() || da.getTransformation()!=null)
- return false;
+ private List<DataAssociation> getDataAssociations(ItemAwareElement element) {
+ List<DataAssociation> list = null;
+ if (element instanceof DataInput)
+ list = getDataInputAssociations();
+ if (element instanceof DataOutput)
+ list = getDataOutputAssociations();
+ List<DataAssociation> result = new ArrayList<DataAssociation>();
+ if (list!=null) {
+ for (DataAssociation da : list) {
+ for (ItemAwareElement e : getSourceElements(da)) {
+ if (element==e)
+ result.add(da);
}
- return true;
}
}
- return false;
- }
-
- public void modify(Object element, String property, Object value) {
- // the real object to be modified is the DataAssociation
- EStructuralFeature f = getTargetFeature((ItemAwareElement)element);
- super.modify(association, f, value);
- tableViewer.refresh(element);
- }
-
- protected List<DataAssociation> getDataAssociations(ItemAwareElement element) {
- if (element instanceof DataInput)
- return getDataInputAssociations();
- if (element instanceof DataOutput)
- return getDataOutputAssociations();
- return null;
+ return result;
}
- public List getDataInputAssociations() {
+ private List getDataInputAssociations() {
if (object instanceof Activity) {
return ((Activity)object).getDataInputAssociations();
}
@@ -175,7 +129,7 @@ public class IoParameterMappingColumn extends TableColumn {
return null;
}
- public List getDataOutputAssociations() {
+ private List getDataOutputAssociations() {
if (object instanceof Activity) {
return ((Activity)object).getDataOutputAssociations();
}
@@ -184,39 +138,32 @@ public class IoParameterMappingColumn extends TableColumn {
}
return null;
}
-
- protected DataAssociation getDataAssociation(ItemAwareElement element) {
- for (DataAssociation da : getDataAssociations(element)) {
- if (element==getSourceElement(da)) {
- return da;
- }
- }
- return null;
- }
- protected ItemAwareElement getSourceElement(DataAssociation da) {
+ private List<ItemAwareElement> getSourceElements(DataAssociation da) {
+ List<ItemAwareElement> result = new ArrayList<ItemAwareElement>();
if (da instanceof DataOutputAssociation) {
if (da.getSourceRef().size()==1)
- return da.getSourceRef().get(0);
+ result.addAll(da.getSourceRef());
}
else if (da instanceof DataInputAssociation) {
- return da.getTargetRef();
+ result.add(da.getTargetRef());
}
- return null;
+ return result;
}
- protected ItemAwareElement getTargetElement(DataAssociation da) {
+ private List<ItemAwareElement> getTargetElements(DataAssociation da) {
+ List<ItemAwareElement> result = new ArrayList<ItemAwareElement>();
if (da instanceof DataInputAssociation) {
if (da.getSourceRef().size()==1)
- return da.getSourceRef().get(0);
+ result.addAll(da.getSourceRef());
}
else if (da instanceof DataOutputAssociation) {
- return da.getTargetRef();
+ result.add(da.getTargetRef());
}
- return null;
+ return result;
}
- protected EStructuralFeature getTargetFeature(ItemAwareElement element) {
+ private EStructuralFeature getTargetFeature(ItemAwareElement element) {
return element instanceof DataInput ?
Bpmn2Package.eINSTANCE.getDataAssociation_SourceRef() :
Bpmn2Package.eINSTANCE.getDataAssociation_TargetRef();
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoParametersDetailComposite.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoParametersDetailComposite.java
index 4e7def58..cf4eb625 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoParametersDetailComposite.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoParametersDetailComposite.java
@@ -87,18 +87,17 @@ public class IoParametersDetailComposite extends AbstractDetailComposite {
inputSetsTable = new IoSetsListComposite(this, be, ioSpecification, inputSetsFeature);
inputSetsTable.bindList(ioSpecification, inputSetsFeature);
inputSetsTable.setTitle(Messages.IoParametersDetailComposite_Input_Sets_Title);
- if (be instanceof ReceiveTask) {
- inputSetsTable.setVisible(false);
- }
+// if (be instanceof ReceiveTask)
+// inputSetsTable.setVisible(false);
}
EStructuralFeature dataInputsFeature = getFeature(ioSpecification, "dataInputs"); //$NON-NLS-1$
if (isModelObjectEnabled(ioSpecification.eClass(),dataInputsFeature)) {
dataInputsTable = new IoParametersListComposite(this, be, ioSpecification, dataInputsFeature);
dataInputsTable.bindList(ioSpecification, dataInputsFeature);
- dataInputsTable.setTitle(Messages.IoParametersDetailComposite_Input_Parameter_Mapping_Title);
- if (be instanceof ReceiveTask)
- dataInputsTable.setVisible(false);
+ dataInputsTable.setTitle(Messages.IoParametersDetailComposite_Input_Data_Mapping_Title);
+// if (be instanceof ReceiveTask)
+// dataInputsTable.setVisible(false);
}
EStructuralFeature outputSetsFeature = getFeature(ioSpecification, "outputSets"); //$NON-NLS-1$
@@ -106,17 +105,17 @@ public class IoParametersDetailComposite extends AbstractDetailComposite {
outputSetsTable = new IoSetsListComposite(this, be, ioSpecification, outputSetsFeature);
outputSetsTable.bindList(ioSpecification, outputSetsFeature);
outputSetsTable.setTitle(Messages.IoParametersDetailComposite_Output_Sets_Title);
- if (be instanceof SendTask)
- outputSetsTable.setVisible(false);
+// if (be instanceof SendTask)
+// outputSetsTable.setVisible(false);
}
EStructuralFeature dataOutputsFeature = getFeature(ioSpecification, "dataOutputs"); //$NON-NLS-1$
if (isModelObjectEnabled(ioSpecification.eClass(),dataOutputsFeature)) {
dataOutputsTable = new IoParametersListComposite(this, be, ioSpecification, dataOutputsFeature);
dataOutputsTable.bindList(ioSpecification, dataOutputsFeature);
- dataOutputsTable.setTitle(Messages.IoParametersDetailComposite_Output_Parameter_Mapping_Title);
- if (be instanceof SendTask)
- dataOutputsTable.setVisible(false);
+ dataOutputsTable.setTitle(Messages.IoParametersDetailComposite_Output_Data_Mapping_Title);
+// if (be instanceof SendTask)
+// dataOutputsTable.setVisible(false);
}
refresh();
}
@@ -127,41 +126,41 @@ public class IoParametersDetailComposite extends AbstractDetailComposite {
@Override
public void refresh() {
- final EStructuralFeature ioSpecificationFeature = businessObject.eClass().getEStructuralFeature("ioSpecification"); //$NON-NLS-1$
- if (ioSpecificationFeature != null) {
- // the control parameter must be an Activity or CallableElement (i.e. a Process or GlobalTask)
- InputOutputSpecification ioSpecification = (InputOutputSpecification)businessObject.eGet(ioSpecificationFeature);
- if (ioSpecification==null) {
- ioSpecification = createModelObject(InputOutputSpecification.class);
- InsertionAdapter.add(businessObject, ioSpecificationFeature, ioSpecification);
- }
- boolean enable = true;
- if (businessObject instanceof ServiceTask) {
- enable = ((ServiceTask)businessObject).getOperationRef() == null;
- }
- if (businessObject instanceof SendTask) {
- enable = ((SendTask)businessObject).getOperationRef() == null && ((SendTask)businessObject).getMessageRef() == null;
- }
- if (businessObject instanceof ReceiveTask) {
- enable = ((ReceiveTask)businessObject).getOperationRef() == null && ((ReceiveTask)businessObject).getMessageRef() == null;
- }
- if (inputSetsTable!=null) {
- inputSetsTable.setBusinessObject(ioSpecification);
- enableActions(inputSetsTable, enable);
- }
- if (dataInputsTable!=null) {
- dataInputsTable.setBusinessObject(ioSpecification);
- enableActions(dataInputsTable, enable);
- }
- if (outputSetsTable!=null) {
- outputSetsTable.setBusinessObject(ioSpecification);
- enableActions(outputSetsTable, enable);
- }
- if (dataOutputsTable!=null) {
- dataOutputsTable.setBusinessObject(ioSpecification);
- enableActions(dataOutputsTable, enable);
- }
- }
+// final EStructuralFeature ioSpecificationFeature = businessObject.eClass().getEStructuralFeature("ioSpecification"); //$NON-NLS-1$
+// if (ioSpecificationFeature != null) {
+// // the control parameter must be an Activity or CallableElement (i.e. a Process or GlobalTask)
+// InputOutputSpecification ioSpecification = (InputOutputSpecification)businessObject.eGet(ioSpecificationFeature);
+// if (ioSpecification==null) {
+// ioSpecification = createModelObject(InputOutputSpecification.class);
+// InsertionAdapter.add(businessObject, ioSpecificationFeature, ioSpecification);
+// }
+// boolean enable = true;
+// if (businessObject instanceof ServiceTask) {
+// enable = ((ServiceTask)businessObject).getOperationRef() == null;
+// }
+// if (businessObject instanceof SendTask) {
+// enable = ((SendTask)businessObject).getOperationRef() == null && ((SendTask)businessObject).getMessageRef() == null;
+// }
+// if (businessObject instanceof ReceiveTask) {
+// enable = ((ReceiveTask)businessObject).getOperationRef() == null && ((ReceiveTask)businessObject).getMessageRef() == null;
+// }
+// if (inputSetsTable!=null) {
+// inputSetsTable.setBusinessObject(ioSpecification);
+// enableActions(inputSetsTable, enable);
+// }
+// if (dataInputsTable!=null) {
+// dataInputsTable.setBusinessObject(ioSpecification);
+// enableActions(dataInputsTable, enable);
+// }
+// if (outputSetsTable!=null) {
+// outputSetsTable.setBusinessObject(ioSpecification);
+// enableActions(outputSetsTable, enable);
+// }
+// if (dataOutputsTable!=null) {
+// dataOutputsTable.setBusinessObject(ioSpecification);
+// enableActions(dataOutputsTable, enable);
+// }
+// }
super.refresh();
}
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoSetsListComposite.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoSetsListComposite.java
index 9a6c70e1..c26a281c 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoSetsListComposite.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoSetsListComposite.java
@@ -81,12 +81,12 @@ public class IoSetsListComposite extends DefaultListComposite {
f = listItemClass.getEStructuralFeature(Messages.IoSetsListComposite_2);
tc = new IoParameterNameColumn(ioSpecification,f);
- tc.setHeaderText(Messages.IoSetsListComposite_3);
+ tc.setHeaderText(Messages.IoSetsListComposite_Input_Data_Header);
columnProvider.add(tc);
f = listItemClass.getEStructuralFeature(Messages.IoSetsListComposite_4);
tc = new IoParameterNameColumn(ioSpecification,f);
- tc.setHeaderText(Messages.IoSetsListComposite_5);
+ tc.setHeaderText(Messages.IoSetsListComposite_Optional_Inputs_Header);
columnProvider.add(tc);
f = listItemClass.getEStructuralFeature("whileExecutingInputRefs"); //$NON-NLS-1$
@@ -106,12 +106,12 @@ public class IoSetsListComposite extends DefaultListComposite {
f = listItemClass.getEStructuralFeature("dataOutputRefs"); //$NON-NLS-1$
tc = new IoParameterNameColumn(ioSpecification,f);
- tc.setHeaderText(Messages.IoSetsListComposite_Output_Parameters_Header);
+ tc.setHeaderText(Messages.IoSetsListComposite_Output_Data_Header);
columnProvider.add(tc);
f = listItemClass.getEStructuralFeature("optionalOutputRefs"); //$NON-NLS-1$
tc = new IoParameterNameColumn(ioSpecification,f);
- tc.setHeaderText(Messages.IoSetsListComposite_Option_Outputs_Header);
+ tc.setHeaderText(Messages.IoSetsListComposite_Optional_Outputs_Header);
columnProvider.add(tc);
f = listItemClass.getEStructuralFeature("whileExecutingOutputRefs"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/Messages.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/Messages.java
index 6f809af7..b34407fc 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/Messages.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/Messages.java
@@ -32,31 +32,31 @@ public class Messages extends NLS {
public static String DataAssociationDetailComposite_Expression_Button;
public static String DataAssociationDetailComposite_Expression_Title;
public static String DataAssociationDetailComposite_From_Title;
- public static String DataAssociationDetailComposite_Input_Parameter_Mapping_Title;
+ public static String DataAssociationDetailComposite_Input_Data_Mapping_Title;
public static String DataAssociationDetailComposite_Invalid_Parameter;
- public static String DataAssociationDetailComposite_Output_Parameter_Mapping_Title;
+ public static String DataAssociationDetailComposite_Output_Data_Mapping_Title;
public static String DataAssociationDetailComposite_To_Title;
public static String DataAssociationDetailComposite_Transform_Button;
public static String DataAssociationDetailComposite_Transform_Title;
- public static String DataAssociationDetailComposite_Variable_Button;
- public static String DataAssociationDetailComposite_Variables_Title;
+ public static String DataAssociationDetailComposite_DataItem_Button;
+ public static String DataAssociationDetailComposite_DataItems_Title;
public static String IoParameterMappingColumn_Transform_Prefix;
- public static String IoParametersDetailComposite_Input_Parameter_Mapping_Title;
+ public static String IoParametersDetailComposite_Input_Data_Mapping_Title;
public static String IoParametersDetailComposite_Input_Sets_Title;
- public static String IoParametersDetailComposite_Output_Parameter_Mapping_Title;
+ public static String IoParametersDetailComposite_Output_Data_Mapping_Title;
public static String IoParametersDetailComposite_Output_Sets_Title;
public static String IoParametersListComposite_From_Header;
public static String IoParametersListComposite_To_Header;
public static String IoSetsListComposite_0;
public static String IoSetsListComposite_1;
public static String IoSetsListComposite_2;
- public static String IoSetsListComposite_3;
+ public static String IoSetsListComposite_Input_Data_Header;
public static String IoSetsListComposite_4;
- public static String IoSetsListComposite_5;
+ public static String IoSetsListComposite_Optional_Inputs_Header;
public static String IoSetsListComposite_Evaluated_While_Executing_Header;
public static String IoSetsListComposite_Input_Sets_Reqd_Header;
- public static String IoSetsListComposite_Option_Outputs_Header;
- public static String IoSetsListComposite_Output_Parameters_Header;
+ public static String IoSetsListComposite_Optional_Outputs_Header;
+ public static String IoSetsListComposite_Output_Data_Header;
public static String IoSetsListComposite_Output_Sets_Produced_Header;
public static String IoSetsListComposite_Produced_While_Executing_Header;
public static String MultiInstanceLoopCharacteristicsDetailComposite_Collection_Button;
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/messages.properties b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/messages.properties
index 7dbc7871..6b251759 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/messages.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/messages.properties
@@ -26,31 +26,31 @@ DataAssociationDetailComposite_Empty=<empty>
DataAssociationDetailComposite_Expression_Button=Expression
DataAssociationDetailComposite_Expression_Title=Expression
DataAssociationDetailComposite_From_Title=From
-DataAssociationDetailComposite_Input_Parameter_Mapping_Title=Input Parameter Mapping Details
-DataAssociationDetailComposite_Invalid_Parameter=The I/O Parameter {0} can not have Mappings.
-DataAssociationDetailComposite_Output_Parameter_Mapping_Title=Output Parameter Mapping Details
+DataAssociationDetailComposite_Input_Data_Mapping_Title=Input Data Mapping Details
+DataAssociationDetailComposite_Invalid_Parameter=The I/O Data {0} can not have Mappings.
+DataAssociationDetailComposite_Output_Data_Mapping_Title=Output Data Mapping Details
DataAssociationDetailComposite_To_Title=To
DataAssociationDetailComposite_Transform_Button=Transformation
DataAssociationDetailComposite_Transform_Title=Transformation
-DataAssociationDetailComposite_Variable_Button=Variable
-DataAssociationDetailComposite_Variables_Title=Variables
+DataAssociationDetailComposite_DataItem_Button=Data Item
+DataAssociationDetailComposite_DataItems_Title=Data Items
IoParameterMappingColumn_Transform_Prefix=Transform:
-IoParametersDetailComposite_Input_Parameter_Mapping_Title=Input Parameter Mapping
+IoParametersDetailComposite_Input_Data_Mapping_Title=Input Data Mapping
IoParametersDetailComposite_Input_Sets_Title=Input Sets
-IoParametersDetailComposite_Output_Parameter_Mapping_Title=Output Parameter Mapping
+IoParametersDetailComposite_Output_Data_Mapping_Title=Output Data Mapping
IoParametersDetailComposite_Output_Sets_Title=Output Sets
IoParametersListComposite_From_Header=From
IoParametersListComposite_To_Header=To
IoSetsListComposite_0=name
IoSetsListComposite_1=inputSets
IoSetsListComposite_2=dataInputRefs
-IoSetsListComposite_3=Input Parameters
+IoSetsListComposite_Input_Data_Header=Input Data
IoSetsListComposite_4=optionalInputRefs
-IoSetsListComposite_5=Optional Inputs
+IoSetsListComposite_Optional_Inputs_Header=Optional Inputs
IoSetsListComposite_Evaluated_While_Executing_Header=Evaluated While Executing
IoSetsListComposite_Input_Sets_Reqd_Header=Input Sets Required
-IoSetsListComposite_Option_Outputs_Header=Optional Outputs
-IoSetsListComposite_Output_Parameters_Header=Output Parameters
+IoSetsListComposite_Optional_Outputs_Header=Optional Outputs
+IoSetsListComposite_Output_Data_Header=Output Data
IoSetsListComposite_Output_Sets_Produced_Header=Output Sets Produced
IoSetsListComposite_Produced_While_Executing_Header=Produced While Executing
MultiInstanceLoopCharacteristicsDetailComposite_Collection_Button=Collection of Data Items
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/util/PropertyUtil.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/util/PropertyUtil.java
index d0ea044b..8cafc888 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/util/PropertyUtil.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/util/PropertyUtil.java
@@ -17,9 +17,7 @@ import java.lang.reflect.Field;
import org.eclipse.bpmn2.modeler.ui.Activator;
import org.eclipse.bpmn2.modeler.ui.IConstants;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;

Back to the top