X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/actions/CustomFiltersActionGroup.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/actions/CustomFiltersActionGroup.java
index e1e546e..74abea1 100644
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/actions/CustomFiltersActionGroup.java
+++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/actions/CustomFiltersActionGroup.java
@@ -23,7 +23,7 @@ import java.util.Stack;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
 
-import net.sourceforge.phpdt.core.IJavaModel;
+//import net.sourceforge.phpdt.core.IJavaModel;
 import net.sourceforge.phpdt.internal.ui.PHPUiImages;
 import net.sourceforge.phpdt.internal.ui.filters.CustomFiltersDialog;
 import net.sourceforge.phpdt.internal.ui.filters.FilterDescriptor;
@@ -44,8 +44,8 @@ import org.eclipse.jface.preference.IPreferenceStore;
 //incastrix
 //import org.eclipse.jface.text.Assert;
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
+//import org.eclipse.jface.viewers.IContentProvider;
+//import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
@@ -56,7 +56,7 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewPart;
+//import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.actions.ActionGroup;
 
 /**
@@ -234,9 +234,9 @@ public class CustomFiltersActionGroup extends ActionGroup {
 	 * @param viewer
 	 *            the viewer to be filtered
 	 */
-	public CustomFiltersActionGroup(IViewPart part, StructuredViewer viewer) {
-		this(part.getViewSite().getId(), viewer);
-	}
+//	public CustomFiltersActionGroup(IViewPart part, StructuredViewer viewer) {
+//		this(part.getViewSite().getId(), viewer);
+//	}
 
 	/**
 	 * Creates a new <code>CustomFiltersActionGroup</code>.
@@ -268,43 +268,43 @@ public class CustomFiltersActionGroup extends ActionGroup {
 		fillViewMenu(actionBars.getMenuManager());
 	}
 
-	public String[] removeFiltersFor(Object parent, Object element,
-			IContentProvider contentProvider) {
-		String[] enabledFilters = getEnabledFilterIds();
-		Set newFilters = new HashSet();
-		for (int i = 0; i < enabledFilters.length; i++) {
-			String filterName = enabledFilters[i];
-			ViewerFilter filter = (ViewerFilter) fInstalledBuiltInFilters
-					.get(filterName);
-			if (filter == null)
-				newFilters.add(filterName);
-			else if (isSelected(parent, element, contentProvider, filter))
-				newFilters.add(filterName);
-		}
-		if (newFilters.size() == enabledFilters.length)
-			return new String[0];
-		return (String[]) newFilters.toArray(new String[newFilters.size()]);
-	}
+//	public String[] removeFiltersFor(Object parent, Object element,
+//			IContentProvider contentProvider) {
+//		String[] enabledFilters = getEnabledFilterIds();
+//		Set newFilters = new HashSet();
+//		for (int i = 0; i < enabledFilters.length; i++) {
+//			String filterName = enabledFilters[i];
+//			ViewerFilter filter = (ViewerFilter) fInstalledBuiltInFilters
+//					.get(filterName);
+//			if (filter == null)
+//				newFilters.add(filterName);
+//			else if (isSelected(parent, element, contentProvider, filter))
+//				newFilters.add(filterName);
+//		}
+//		if (newFilters.size() == enabledFilters.length)
+//			return new String[0];
+//		return (String[]) newFilters.toArray(new String[newFilters.size()]);
+//	}
 
 	public void setFilters(String[] newFilters) {
 		setEnabledFilterIds(newFilters);
 		updateViewerFilters(true);
 	}
 
-	private boolean isSelected(Object parent, Object element,
-			IContentProvider contentProvider, ViewerFilter filter) {
-		if (contentProvider instanceof ITreeContentProvider) {
-			// the element and all its parents have to be selected
-			ITreeContentProvider provider = (ITreeContentProvider) contentProvider;
-			while (element != null && !(element instanceof IJavaModel)) {
-				if (!filter.select(fViewer, parent, element))
-					return false;
-				element = provider.getParent(element);
-			}
-			return true;
-		}
-		return filter.select(fViewer, parent, element);
-	}
+//	private boolean isSelected(Object parent, Object element,
+//			IContentProvider contentProvider, ViewerFilter filter) {
+//		if (contentProvider instanceof ITreeContentProvider) {
+//			// the element and all its parents have to be selected
+//			ITreeContentProvider provider = (ITreeContentProvider) contentProvider;
+//			while (element != null && !(element instanceof IJavaModel)) {
+//				if (!filter.select(fViewer, parent, element))
+//					return false;
+//				element = provider.getParent(element);
+//			}
+//			return true;
+//		}
+//		return filter.select(fViewer, parent, element);
+//	}
 
 	/**
 	 * Sets the enable state of the given filter.