diff options
author | Bob Brodt | 2015-11-09 19:51:14 +0000 |
---|---|---|
committer | Bob Brodt | 2015-11-09 19:51:14 +0000 |
commit | 3472cdaeddc0a1893bcf278fa391e07263c8def7 (patch) | |
tree | 24cc7cafd5ed0a1ab90ea9d177c0d2e021a675dd | |
parent | 9c3ad97eb0ec200c95ded00271cbf6a2f29e7fa1 (diff) | |
download | org.eclipse.bpmn2-modeler-3472cdaeddc0a1893bcf278fa391e07263c8def7.tar.gz org.eclipse.bpmn2-modeler-3472cdaeddc0a1893bcf278fa391e07263c8def7.tar.xz org.eclipse.bpmn2-modeler-3472cdaeddc0a1893bcf278fa391e07263c8def7.zip |
https://bugzilla.redhat.com/show_bug.cgi?id=1249658 - Input parameters
of throw event affect process variables
3 files changed, 30 insertions, 4 deletions
diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/adapters/JbpmDataInputPropertiesAdapter.java b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/adapters/JbpmDataInputPropertiesAdapter.java index db1ac223..3c4bf936 100644 --- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/adapters/JbpmDataInputPropertiesAdapter.java +++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/adapters/JbpmDataInputPropertiesAdapter.java @@ -14,6 +14,9 @@ import java.util.Hashtable; import org.eclipse.bpmn2.Bpmn2Package; import org.eclipse.bpmn2.DataInput; +import org.eclipse.bpmn2.ItemAwareElement; +import org.eclipse.bpmn2.ItemDefinition; +import org.eclipse.bpmn2.RootElement; import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.util.JbpmModelUtil; import org.eclipse.bpmn2.modeler.ui.adapters.properties.DataInputPropertiesAdapter; import org.eclipse.bpmn2.modeler.ui.adapters.properties.ItemDefinitionRefFeatureDescriptor; @@ -38,7 +41,17 @@ public class JbpmDataInputPropertiesAdapter extends DataInputPropertiesAdapter { value = JbpmModelUtil.getDataType(dataInput, value); super.internalSet(object, feature, value, index); } - + + @Override + protected void changeReferences(RootElement object, ItemDefinition itemDefinition) { + // do nothing! + } + + @Override + protected void changeReferences(ItemAwareElement object, ItemDefinition itemDefinition) { + // do nothing! + } + @Override public Hashtable<String, Object> getChoiceOfValues() { return JbpmModelUtil.getChoiceOfValues(object); diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/adapters/JbpmDataOutputPropertiesAdapter.java b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/adapters/JbpmDataOutputPropertiesAdapter.java index e513aa9e..17866b24 100644 --- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/adapters/JbpmDataOutputPropertiesAdapter.java +++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/adapters/JbpmDataOutputPropertiesAdapter.java @@ -14,6 +14,9 @@ import java.util.Hashtable; import org.eclipse.bpmn2.Bpmn2Package; import org.eclipse.bpmn2.DataOutput; +import org.eclipse.bpmn2.ItemAwareElement; +import org.eclipse.bpmn2.ItemDefinition; +import org.eclipse.bpmn2.RootElement; import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.util.JbpmModelUtil; import org.eclipse.bpmn2.modeler.ui.adapters.properties.DataOutputPropertiesAdapter; import org.eclipse.bpmn2.modeler.ui.adapters.properties.ItemDefinitionRefFeatureDescriptor; @@ -38,7 +41,17 @@ public class JbpmDataOutputPropertiesAdapter extends DataOutputPropertiesAdapter value = JbpmModelUtil.getDataType(dataOutput, value); super.internalSet(object, feature, value, index); } - + + @Override + protected void changeReferences(RootElement object, ItemDefinition itemDefinition) { + // do nothing! + } + + @Override + protected void changeReferences(ItemAwareElement object, ItemDefinition itemDefinition) { + // do nothing! + } + @Override public Hashtable<String, Object> getChoiceOfValues() { return JbpmModelUtil.getChoiceOfValues(object); diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ItemDefinitionRefFeatureDescriptor.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ItemDefinitionRefFeatureDescriptor.java index 649123e1..367d0c28 100644 --- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ItemDefinitionRefFeatureDescriptor.java +++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/ItemDefinitionRefFeatureDescriptor.java @@ -114,7 +114,7 @@ public class ItemDefinitionRefFeatureDescriptor<T extends BaseElement> extends F } } - private void changeReferences(RootElement object, ItemDefinition itemDefinition) { + protected void changeReferences(RootElement object, ItemDefinition itemDefinition) { for (EObject ed : ModelUtil.getAllReachableObjects(object, Bpmn2Package.eINSTANCE.getEventDefinition())) { if (EventDefinitionsUtil.getEventDefinitionTarget((EventDefinition)ed) == object) { Tuple<ItemAwareElement, DataAssociation> param = @@ -124,7 +124,7 @@ public class ItemDefinitionRefFeatureDescriptor<T extends BaseElement> extends F } } - private void changeReferences(ItemAwareElement object, ItemDefinition itemDefinition) { + protected void changeReferences(ItemAwareElement object, ItemDefinition itemDefinition) { Definitions definitions = ModelUtil.getDefinitions(object); Stack<ItemAwareElement> changedObjects = new Stack<ItemAwareElement>(); changedObjects.push((ItemAwareElement)object); |