diff options
| author | Paul Leacu | 2017-09-07 17:16:54 +0000 |
|---|---|---|
| committer | Paul Leacu | 2017-09-07 17:16:54 +0000 |
| commit | 985769aa546b222bad2c5ed405564eab6048c63f (patch) | |
| tree | f0375cea707a277f2906095b2ae9a4e9d8d979bb | |
| parent | a36599560d18bbb4a7455bd61d2ee2fe0a8aed81 (diff) | |
| download | org.eclipse.bpmn2-modeler-985769aa546b222bad2c5ed405564eab6048c63f.tar.gz org.eclipse.bpmn2-modeler-985769aa546b222bad2c5ed405564eab6048c63f.tar.xz org.eclipse.bpmn2-modeler-985769aa546b222bad2c5ed405564eab6048c63f.zip | |
[521998] NPE in DIUtils.findBPMNEdge
Change-Id: Ic9d549401eb02fd78ef81acf1fedf7de05be8908
Signed-off-by: Paul Leacu <pleacu@redhat.com>
| -rw-r--r-- | plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/di/DIUtils.java | 9 |
1 files changed, 7 insertions, 2 deletions
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 45d5d6ce..114a868c 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 @@ public class DIUtils { 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 @@ public class DIUtils { } return bpmnStyle; } - + /* Not currently referenced private static boolean compareDILabelStyle(BPMNLabelStyle ls1, BPMNLabelStyle ls2) { if (ls1==null) { if (ls2==null) @@ -408,7 +409,7 @@ public class DIUtils { 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 class DIUtils { } 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) |