Revert "Bug 384646: Improves the performance of the install software filter"

This reverts commit d709ac369fb457887ecb709a3680da983bb9d9cc.

2 files changed, 1 insertions, 12 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java
index 884448c04..3bee4d934 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java
@@ -141,11 +141,7 @@ public class QueryProvider {
 						// We need an expression that uses the requirements of the element's requirements, which could be merged
 						// from multiple category IUs shown as one in the UI.
 						IExpression matchesRequirementsExpression = ExpressionUtil.parse("$0.exists(r | this ~= r)"); //$NON-NLS-1$
-						// First perform the "top level" query to limit the amount of
-						// data we need to match in our category query.
-						IQuery<IInstallableUnit> iuGroupQuery = topLevelQuery;
-						IQuery<IInstallableUnit> memberQuery = QueryUtil.createMatchQuery(matchesRequirementsExpression, ((CategoryElement) element).getRequirements());
-						memberOfCategoryQuery = QueryUtil.createPipeQuery(iuGroupQuery, memberQuery);
+						memberOfCategoryQuery = QueryUtil.createMatchQuery(matchesRequirementsExpression, ((CategoryElement) element).getRequirements());
 					} else {
 						memberOfCategoryQuery = QueryUtil.createIUCategoryMemberQuery(((IIUElement) element).getIU());
 					}
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/QueriedElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/QueriedElement.java
index 451cfc74b..a478e683f 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/QueriedElement.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/QueriedElement.java
@@ -66,10 +66,6 @@ public abstract class QueriedElement extends ProvElement {
 	}
 
 	public Object[] getChildren(Object o) {
-		Object[] cache = getCachedChildren();
-		if (cache.length > 0) {
-			return getCachedChildren();
-		}
 		return fetchChildren(o, new NullProgressMonitor());
 	}
 
@@ -163,9 +159,6 @@ public abstract class QueriedElement extends ProvElement {
 	}
 
 	public Object[] getCachedChildren() {
-		if (cachedChildren == null) {
-			return new Object[0];
-		}
 		return cachedChildren.toArray();
 	}