summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Bull2012-11-19 14:47:43 (EST)
committerIan Bull2012-11-19 14:47:43 (EST)
commitc25f316ce3aa843c20cd208a8f7d43b36be2dc01 (patch)
treee7ac1d0b69deb78d261acf147d21f274e5943920
parentcecf43ce5d7eb99d356a798afdecfee2a3910788 (diff)
downloadrt.equinox.p2-c25f316ce3aa843c20cd208a8f7d43b36be2dc01.zip
rt.equinox.p2-c25f316ce3aa843c20cd208a8f7d43b36be2dc01.tar.gz
rt.equinox.p2-c25f316ce3aa843c20cd208a8f7d43b36be2dc01.tar.bz2
Revert "Bug 384646: Improves the performance of the install software filter"
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/QueriedElement.java7
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 884448c..3bee4d9 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 451cfc7..a478e68 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();
}