diff options
| author | cdumoulin | 2009-06-16 21:52:37 +0000 |
|---|---|---|
| committer | cdumoulin | 2009-06-16 21:52:37 +0000 |
| commit | 1391665caab1770293311b4f9141d57f3c893430 (patch) | |
| tree | 6d1146cea4449389e40692f6ca17bed5ec086180 | |
| parent | eb67e3448aa8c7e355bcf3d341ba542698b45393 (diff) | |
| download | org.eclipse.papyrus-1391665caab1770293311b4f9141d57f3c893430.tar.gz org.eclipse.papyrus-1391665caab1770293311b4f9141d57f3c893430.tar.xz org.eclipse.papyrus-1391665caab1770293311b4f9141d57f3c893430.zip | |
NEW - bug 280532: [Class diagram] Action relying on getCurrentDiagram() should check for null
https://bugs.eclipse.org/bugs/show_bug.cgi?id=280532
Check for null in one action.
2 files changed, 8 insertions, 2 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/custom/edit/actions/InitializeDiagramAction.java b/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/custom/edit/actions/InitializeDiagramAction.java index 855aae9bba1..fd95108fa7f 100644 --- a/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/custom/edit/actions/InitializeDiagramAction.java +++ b/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/custom/edit/actions/InitializeDiagramAction.java @@ -52,7 +52,12 @@ public class InitializeDiagramAction extends AbstractAction { */ @Override public boolean isEnabled() { - return getDiagramNotationID().equals(getCurrentDiagram().getType()); + try { + return getDiagramNotationID().equals(getCurrentDiagram().getType()); + } catch (NullPointerException e) { + // thrown by getCurrentDiagram() when no diagram is found. + return false; + } } /** diff --git a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/AbstractAction.java b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/AbstractAction.java index a0281cdaeaa..179235b68c5 100644 --- a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/AbstractAction.java +++ b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/AbstractAction.java @@ -38,7 +38,8 @@ public abstract class AbstractAction extends Action { private IGraphicalEditPart host; /** - * @return the current diagram + * @return the current diagram or null if not found. + * TODO : throw appropriate exception if not found ? */ protected Diagram getCurrentDiagram() { IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); |