diff options
| author | Laurent Redor | 2016-08-16 07:37:52 +0000 |
|---|---|---|
| committer | Laurent Redor | 2016-08-18 08:49:52 +0000 |
| commit | bb1419b293e5524290245918cb12eadc72dc2b93 (patch) | |
| tree | 22b83f8f49ddd0c948b672a0168bed1767773ab3 | |
| parent | fdf76fd5bdc7ae0dc9c169c9582274ff608ecb59 (diff) | |
| download | org.eclipse.sirius-bb1419b293e5524290245918cb12eadc72dc2b93.tar.gz org.eclipse.sirius-bb1419b293e5524290245918cb12eadc72dc2b93.tar.xz org.eclipse.sirius-bb1419b293e5524290245918cb12eadc72dc2b93.zip | |
[496466] Fix NPE
Since commit [1], there is a potential NPE, for example in deprecated
"old UI" mode (used in some tests).
[1]
http://git.eclipse.org/c/sirius/org.eclipse.sirius.git/commit/?id=1dcd33112221bba76fdc3f9a3657deb1dd00d5a6
Bug: 496466
Change-Id: I505add5d62b003c1f053094eaea9453eb62f97e9
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/layout/CopyFormatAction.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/layout/CopyFormatAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/layout/CopyFormatAction.java index b5f3720cdb..6f01a3df5a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/layout/CopyFormatAction.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/layout/CopyFormatAction.java @@ -164,7 +164,9 @@ public class CopyFormatAction extends AbstractCopyPasteFormatAction { IEditorPart editor = ref.getEditor(false); if (editor instanceof DDiagramEditorImpl) { DDiagramEditorImpl diagramEditor = (DDiagramEditorImpl) editor; - diagramEditor.getTabbar().reinitToolBar(diagramEditor.getDiagramGraphicalViewer().getSelection()); + if (diagramEditor.getTabbar() != null) { + diagramEditor.getTabbar().reinitToolBar(diagramEditor.getDiagramGraphicalViewer().getSelection()); + } } } } |
