diff options
| author | Paul Leacu | 2017-09-25 19:42:47 +0000 |
|---|---|---|
| committer | Paul Leacu | 2017-09-25 19:42:47 +0000 |
| commit | bce32603610562dcc3d90d11704855963ff281a8 (patch) | |
| tree | 5990ae9bd1092de3f540cfd6be88e261c879dd23 | |
| parent | 50003e78548a3d45fd23da59eddcae635c337c7c (diff) | |
| download | org.eclipse.bpmn2-modeler-bce32603610562dcc3d90d11704855963ff281a8.tar.gz org.eclipse.bpmn2-modeler-bce32603610562dcc3d90d11704855963ff281a8.tar.xz org.eclipse.bpmn2-modeler-bce32603610562dcc3d90d11704855963ff281a8.zip | |
[522768] Make sure you have a valid diagram editor before determining the editing domain.
Change-Id: I588c4d94038579507a457c7898b5cfe7227ae0a0
Signed-off-by: Paul Leacu <pleacu@redhat.com>
| -rw-r--r-- | plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java index 09ab7dc2..4a1a0c73 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java @@ -117,8 +117,12 @@ public class ListAndDetailCompositeBase extends Composite implements ResourceSet } protected void addDomainListener() { - if (editingDomain==null) { - editingDomain = (TransactionalEditingDomainImpl)getDiagramEditor().getEditingDomain(); + if (editingDomain == null) { + if (diagramEditor == null) { + if ((diagramEditor = getDiagramEditor()) == null) + return; + } + editingDomain = (TransactionalEditingDomainImpl)diagramEditor.getEditingDomain(); editingDomain.addResourceSetListener(this); } } |