diff options
| author | Steve Monnier | 2017-12-21 16:29:03 +0000 |
|---|---|---|
| committer | Steve Monnier | 2017-12-21 16:36:25 +0000 |
| commit | 8c1321bf7f4b13f418bec0e5b99dfa20def4e9fa (patch) | |
| tree | a2c6abe8d74b7b22fc5a3d27a556307b909ac32e | |
| parent | 6c66e2dd2a2914695c6603a05a2b338a7c225dea (diff) | |
| download | org.eclipse.sirius-8c1321bf7f4b13f418bec0e5b99dfa20def4e9fa.tar.gz org.eclipse.sirius-8c1321bf7f4b13f418bec0e5b99dfa20def4e9fa.tar.xz org.eclipse.sirius-8c1321bf7f4b13f418bec0e5b99dfa20def4e9fa.zip | |
[529111] Fix NPE on setSelection after deletion
Addition of a simple test to avoid a NPE in setSelectionToViewer when
treeViewer is null.
Bug: 529111
Change-Id: I7777d123478e45e55d9ab3df4fbe09c75c5981f3
Signed-off-by: Steve Monnier <steve.monnier@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/internal/graphicalcomponents/GraphicalSemanticModelsHandler.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/internal/graphicalcomponents/GraphicalSemanticModelsHandler.java b/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/internal/graphicalcomponents/GraphicalSemanticModelsHandler.java index 8388239c43..f689a6438e 100644 --- a/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/internal/graphicalcomponents/GraphicalSemanticModelsHandler.java +++ b/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/internal/graphicalcomponents/GraphicalSemanticModelsHandler.java @@ -493,7 +493,9 @@ public class GraphicalSemanticModelsHandler implements SessionListener, SessionM public void run() { // Try to select the items in the current content viewer of // the editor. - treeViewer.setSelection(new StructuredSelection(theSelection.toArray()), true); + if (treeViewer != null) { + treeViewer.setSelection(new StructuredSelection(theSelection.toArray()), true); + } } }; site.getShell().getDisplay().asyncExec(runnable); |