mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 13:05:22 +02:00
Code Issues Wiki Activity

[243263] NPE on expanding a filter - null pointer checks

Browse source
This commit is contained in:
David McKnight 2008-08-18 20:18:21 +00:00
parent 651a27bf7d
commit 57cafc2f90
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java
View file

@ -26,6 +26,7 @@
* Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread * Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread
* Martin Oberhuber (Wind River) - [234215] improve API documentation for doDelete and doDeleteBatch * Martin Oberhuber (Wind River) - [234215] improve API documentation for doDelete and doDeleteBatch
* David McKnight (IBM) - [239368] Expand to action ignores the filter string * David McKnight (IBM) - [239368] Expand to action ignores the filter string
* David McKnight (IBM) - [243263] NPE on expanding a filter - null pointer checks
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.ui.view; package org.eclipse.rse.ui.view;
@ -85,7 +86,9 @@ import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem; import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.swt.widgets.Widget; import org.eclipse.swt.widgets.Widget;
import org.eclipse.ui.IActionFilter; import org.eclipse.ui.IActionFilter;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.model.IWorkbenchAdapter;
import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; import org.eclipse.ui.progress.IDeferredWorkbenchAdapter;
import org.eclipse.ui.progress.IElementCollector; import org.eclipse.ui.progress.IElementCollector;
@ -2319,7 +2322,14 @@ public abstract class AbstractSystemViewAdapter implements ISystemViewElementAda
*/ */
protected SystemFetchOperation getSystemFetchOperation(Object o, IElementCollector collector) protected SystemFetchOperation getSystemFetchOperation(Object o, IElementCollector collector)
{ {
IWorkbenchPart currentPart = SystemBasePlugin.getActiveWorkbenchWindow().getActivePage().getActivePart(); IWorkbenchWindow win = SystemBasePlugin.getActiveWorkbenchWindow();
IWorkbenchPart currentPart = null;
if (win != null){
IWorkbenchPage page = win.getActivePage();
if (page != null){
currentPart = page.getActivePart();
}
}
return new SystemFetchOperation(currentPart, o, this, collector); return new SystemFetchOperation(currentPart, o, this, collector);
} }