--- ContainedLibraryFilter.java	Fri Aug  7 13:51:10 2009
+++ LibraryFilter.java	Fri Aug  7 13:51:41 2009
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,39 +8,30 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jdt.internal.ui.filters;
+package org.eclipse.jdt.internal.ui.viewsupport;
 
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 
-
 /**
- * The LibraryFilter is a filter used to determine whether
- * a Java internal library is shown
+ * Filters out all elements which libraries
  */
-public class ContainedLibraryFilter extends ViewerFilter {
+public class LibraryFilter extends ViewerFilter {
 
-	/* (non-Javadoc)
-	 * Method declared on ViewerFilter.
+	/**
+	 * Returns the result of this filter, when applied to the
+	 * given inputs.
+	 *
+	 * @param viewer the viewer
+	 * @param parent the parent element
+	 * @param element the element to test
+	 * @return Returns true if element should be included in filtered set
 	 */
-	public boolean select(Viewer viewer, Object parentElement, Object element) {
-		if (element instanceof IPackageFragmentRoot) {
-			IPackageFragmentRoot root= (IPackageFragmentRoot)element;
-			if (root.isArchive()) {
-				// don't filter out JARs contained in the project itself
-				IResource resource= root.getResource();
-				if (resource != null) {
-					IProject jarProject= resource.getProject();
-					IProject container= root.getJavaProject().getProject();
-					return !container.equals(jarProject);
-				}
-			}
-		}
+	public boolean select(Viewer viewer, Object parent, Object element) {
+		if (element instanceof IPackageFragmentRoot)
+			return !((IPackageFragmentRoot)element).isArchive();
 		return true;
 	}
 }
