[521998] NPE in DIUtils.findBPMNEdge
Change-Id: Ic9d549401eb02fd78ef81acf1fedf7de05be8908
Signed-off-by: Paul Leacu <pleacu@redhat.com>
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/di/DIUtils.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/di/DIUtils.java
index 45d5d6c..114a868 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/di/DIUtils.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/di/DIUtils.java
@@ -358,6 +358,7 @@
return bpmnStyle;
}
+ @SuppressWarnings("unlikely-arg-type")
public static BPMNLabelStyle getOrCreateDILabelStyle(BaseElement element, ShapeStyle ss) {
BPMNLabelStyle bpmnStyle = null;
DiagramElement de = DIUtils.findDiagramElement(element);
@@ -383,7 +384,7 @@
}
return bpmnStyle;
}
-
+ /* Not currently referenced
private static boolean compareDILabelStyle(BPMNLabelStyle ls1, BPMNLabelStyle ls2) {
if (ls1==null) {
if (ls2==null)
@@ -408,7 +409,7 @@
f1.isIsStrikeThrough() == f2.isIsStrikeThrough() &&
f1.isIsUnderline() == f2.isIsUnderline();
}
-
+ */
public static DiagramElement findDiagramElement(List<BPMNDiagram> diagrams, BaseElement bpmnElement) {
for (BPMNDiagram d : diagrams) {
BPMNPlane plane = d.getPlane();
@@ -804,6 +805,10 @@
}
public static BPMNEdge findBPMNEdge(BPMNDiagram bpmnDiagram, EObject baseElement) {
+
+ if (bpmnDiagram == null || bpmnDiagram.getPlane() == null)
+ return null;
+
for (DiagramElement de : bpmnDiagram.getPlane().getPlaneElement()) {
if (de instanceof BPMNEdge) {
if (((BPMNEdge)de).getBpmnElement() == baseElement)
