Bug 173304
NPE in EditDetailFormatterAction when called from context menu of Variables view
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditDetailFormatterAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditDetailFormatterAction.java
index 96e5cb1..188c79d 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditDetailFormatterAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditDetailFormatterAction.java
@@ -31,35 +31,34 @@
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
public void run(IAction action) {
- IStructuredSelection selection= getCurrentSelection();
- if (selection.size() != 1) {
- return;
- }
- Object element= selection.getFirstElement();
- IJavaType type;
- try {
- IJavaValue value;
- if (element instanceof IJavaVariable) {
- value = ((IJavaValue)((IJavaVariable) element).getValue());
- } else if (element instanceof JavaInspectExpression) {
- value = ((IJavaValue)((JavaInspectExpression) element).getValue());
- } else {
+ IStructuredSelection selection = getCurrentSelection();
+ if(selection != null && selection.size() == 1) {
+ Object element = selection.getFirstElement();
+ IJavaType type;
+ try {
+ IJavaValue value;
+ if (element instanceof IJavaVariable) {
+ value = ((IJavaValue)((IJavaVariable) element).getValue());
+ } else if (element instanceof JavaInspectExpression) {
+ value = ((IJavaValue)((JavaInspectExpression) element).getValue());
+ } else {
+ return;
+ }
+ type= value.getJavaType();
+ } catch (DebugException e) {
return;
}
- type= value.getJavaType();
- } catch (DebugException e) {
- return;
- }
- JavaDetailFormattersManager fm = JavaDetailFormattersManager.getDefault();
- DetailFormatter formatter = fm.getAssociatedDetailFormatter(type);
- if(formatter == null & type instanceof IJavaClassType) {
- formatter = fm.getDetailFormatterFromInterface((IJavaClassType) type);
- if(formatter == null) {
- formatter = fm.getDetailFormatterFromSuperclass((IJavaClassType) type);
+ JavaDetailFormattersManager fm = JavaDetailFormattersManager.getDefault();
+ DetailFormatter formatter = fm.getAssociatedDetailFormatter(type);
+ if(formatter == null & type instanceof IJavaClassType) {
+ formatter = fm.getDetailFormatterFromInterface((IJavaClassType) type);
+ if(formatter == null) {
+ formatter = fm.getDetailFormatterFromSuperclass((IJavaClassType) type);
+ }
}
- }
- if (new DetailFormatterDialog(JDIDebugUIPlugin.getActivePage().getWorkbenchWindow().getShell(), formatter, null, false, true).open() == Window.OK) {
- fm.setAssociatedDetailFormatter(formatter);
+ if (new DetailFormatterDialog(JDIDebugUIPlugin.getActivePage().getWorkbenchWindow().getShell(), formatter, null, false, true).open() == Window.OK) {
+ fm.setAssociatedDetailFormatter(formatter);
+ }
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectActionDelegate.java
index 8c13a81..4dff441 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectActionDelegate.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectActionDelegate.java
@@ -47,8 +47,12 @@
public void selectionChanged(IAction action, ISelection sel) {
}
+ /**
+ * Returns the currently selected item(s) form the current workbench page
+ * @return the currently selected item(s)
+ */
protected IStructuredSelection getCurrentSelection() {
- IWorkbenchPage page= JDIDebugUIPlugin.getActivePage();
+ IWorkbenchPage page = JDIDebugUIPlugin.getActivePage();
if (page != null) {
ISelection selection= page.getSelection();
if (selection instanceof IStructuredSelection) {
