Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Brodt2014-08-13 17:20:26 -0400
committerBob Brodt2014-08-13 17:20:26 -0400
commit6c931d9b776d55cfe11223fe9af08186c888ddd6 (patch)
tree12f17a36f2a8bc3173faf50c4ace90154d5ab356
parent5e820fb329bc86e7f33def3b9547feeafbeebd02 (diff)
downloadorg.eclipse.bpmn2-modeler-develop.tar.gz
org.eclipse.bpmn2-modeler-develop.tar.xz
org.eclipse.bpmn2-modeler-develop.zip
Fixed bug discovered during SY plugin migration.develop
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/TargetRuntime.java2
-rw-r--r--plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/FeatureSupport.java14
2 files changed, 9 insertions, 7 deletions
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/TargetRuntime.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/TargetRuntime.java
index 702df098..da6620c4 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/TargetRuntime.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/TargetRuntime.java
@@ -933,7 +933,6 @@ public class TargetRuntime extends BaseRuntimeExtensionDescriptor implements IRu
list.put(eClass,features);
}
for (Property p : med.getProperties()) {
- EStructuralFeature feature = med.createEFeature(eClass, p);
if (bpmn2type instanceof EClass) {
// ignore structural features that are already defined in
// the BPMN2 package. These <property> elements are used
@@ -942,6 +941,7 @@ public class TargetRuntime extends BaseRuntimeExtensionDescriptor implements IRu
if (((EClass) bpmn2type).getEStructuralFeature(p.name)!=null)
continue;
}
+ EStructuralFeature feature = med.createEFeature(eClass, p);
if (feature!=null && !features.contains(feature))
features.add(feature);
for (Object v : p.getValues()) {
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/FeatureSupport.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/FeatureSupport.java
index 03c7c971..2c50630a 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/FeatureSupport.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/FeatureSupport.java
@@ -126,12 +126,14 @@ public class FeatureSupport {
}
public static boolean isChoreographyParticipantBand(PictogramElement element) {
- EObject container = element.eContainer();
- if (container instanceof PictogramElement) {
- PictogramElement containerElem = (PictogramElement) container;
- Object bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(containerElem);
- if (bo instanceof ChoreographyActivity) {
- return true;
+ if (element!=null) {
+ EObject container = element.eContainer();
+ if (container instanceof PictogramElement) {
+ PictogramElement containerElem = (PictogramElement) container;
+ Object bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(containerElem);
+ if (bo instanceof ChoreographyActivity) {
+ return true;
+ }
}
}
return false;

Back to the top