Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsben-zeev2006-07-17 08:17:31 -0400
committersben-zeev2006-07-17 08:17:31 -0400
commit067a581824c45884636f1680a3b66629436732e0 (patch)
tree6ea7fbce1836c4c4a0ca9d4f46a3a1bac63c8a6c
parent8533d87cbe5facd18de30d40eb0d715c3d48164f (diff)
downloadorg.eclipse.pdt-067a581824c45884636f1680a3b66629436732e0.tar.gz
org.eclipse.pdt-067a581824c45884636f1680a3b66629436732e0.tar.xz
org.eclipse.pdt-067a581824c45884636f1680a3b66629436732e0.zip
bug fix in explorer filters
-rw-r--r--plugins/org.eclipse.php.ui/src/org/eclipse/php/ui/explorer/ExplorerPart.java27
1 files changed, 4 insertions, 23 deletions
diff --git a/plugins/org.eclipse.php.ui/src/org/eclipse/php/ui/explorer/ExplorerPart.java b/plugins/org.eclipse.php.ui/src/org/eclipse/php/ui/explorer/ExplorerPart.java
index a4b03becf..b7a798004 100644
--- a/plugins/org.eclipse.php.ui/src/org/eclipse/php/ui/explorer/ExplorerPart.java
+++ b/plugins/org.eclipse.php.ui/src/org/eclipse/php/ui/explorer/ExplorerPart.java
@@ -221,26 +221,6 @@ public class ExplorerPart extends ViewPart implements IMenuListener {
}
/*
- * @see org.eclipse.jface.viewers.StructuredViewer#filter(java.lang.Object)
- */
- protected Object[] getFilteredChildren(Object parent) {
- List list = new ArrayList();
- ViewerFilter[] filters = fViewer.getFilters();
- Object[] children = ((ITreeContentProvider) fViewer.getContentProvider()).getChildren(parent);
- for (int i = 0; i < children.length; i++) {
- Object object = children[i];
- if (!isEssential(object)) {
- object = filter(object, parent, filters);
- if (object != null) {
- list.add(object);
- }
- } else
- list.add(object);
- }
- return list.toArray();
- }
-
- /*
* @see AbstractTreeViewer#isExpandable(java.lang.Object)
*/
public boolean isExpandable(Object parent) {
@@ -261,12 +241,13 @@ public class ExplorerPart extends ViewPart implements IMenuListener {
// Sends the object through the given filters
private Object filter(Object object, Object parent, ViewerFilter[] filters) {
+ Object rv = null;
for (int i = 0; i < filters.length; i++) {
ViewerFilter filter = filters[i];
- if (!filter.select(fViewer, parent, object))
- return null;
+ if (filter.select(fViewer, parent, object))
+ rv = object;
}
- return object;
+ return rv;
}
/*

Back to the top