Bug 178795 NPE from add exception breakpoint dialog
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionDialog.java
index bcfc418..1d22da8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionDialog.java
@@ -495,8 +495,8 @@
* @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#getElementName(java.lang.Object)
*/
public String getElementName(Object item) {
- if(item instanceof IType) {
- return ((IType)item).getElementName();
+ if(item instanceof TypeNameMatch) {
+ return ((TypeNameMatch)item).getSimpleTypeName();
}
return null;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java
index a3e977b..4d01c15 100755
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java
@@ -189,13 +189,13 @@
}
private static final String SETTINGS_ID = JDIDebugUIPlugin.getUniqueIdentifier() + ".MAIN_METHOD_SELECTION_DIALOG"; //$NON-NLS-1$
- private Object[] fTypes = null;
+ private IType[] fTypes = null;
/**
* Constructor
* @param elements the types to display in the dialog
*/
- public DebugTypeSelectionDialog(Shell shell, Object[] elements, String title) {
+ public DebugTypeSelectionDialog(Shell shell, IType[] elements, String title) {
super(shell, false);
setTitle(title);
fTypes = elements;
@@ -280,6 +280,9 @@
* @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#getElementName(java.lang.Object)
*/
public String getElementName(Object item) {
+ if(item instanceof IType) {
+ return ((IType)item).getElementName();
+ }
return null;
}
}
