From 2c4df36f2cbc6395c001c52df12422c34b32def8 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Fri, 29 Jun 2007 20:30:07 +0000 Subject: [PATCH] action filter can't filter out "Pending..." for deferred queries. To allow this, I'm having select() return true when there is no rse adapter. --- .../UI/org/eclipse/rse/ui/SystemActionViewerFilter.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemActionViewerFilter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemActionViewerFilter.java index 14e54f1c9d3..38aa50464b3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemActionViewerFilter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemActionViewerFilter.java @@ -150,6 +150,8 @@ public class SystemActionViewerFilter extends ViewerFilter { */ public boolean select(Viewer viewer, Object parentElement, Object element) { + + // check if the object is an instance of one of the object types we want to filter Class objType = isInstance(element); @@ -165,6 +167,12 @@ public class SystemActionViewerFilter extends ViewerFilter { IAdaptable adaptable = (IAdaptable)element; adapter = (ISystemViewElementAdapter)(adaptable.getAdapter(ISystemViewElementAdapter.class)); + if (adapter == null) + { + // might be deferred stuff + return true; + } + // get list of criteria List criteria = (List)(map.get(objType));