Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hallgren2010-02-24 20:49:46 +0000
committerThomas Hallgren2010-02-24 20:49:46 +0000
commit8bac67a557cac9a676f1116dd5412048a7ba2241 (patch)
treef360f4d8f1f7b72e0cc97e6ddfa0f20d71291186 /bundles/org.eclipse.equinox.p2.ql
parente659d374347a03d5662203090fa7e38a53bc2ff6 (diff)
downloadrt.equinox.p2-8bac67a557cac9a676f1116dd5412048a7ba2241.tar.gz
rt.equinox.p2-8bac67a557cac9a676f1116dd5412048a7ba2241.tar.xz
rt.equinox.p2-8bac67a557cac9a676f1116dd5412048a7ba2241.zip
302201 : Unify the two query approaches used in p2, step 6.
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.ql')
-rw-r--r--bundles/org.eclipse.equinox.p2.ql/.settings/.api_filters16
-rw-r--r--bundles/org.eclipse.equinox.p2.ql/META-INF/MANIFEST.MF1
-rw-r--r--bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/internal/p2/ql/expression/QLFactory.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/internal/p2/ql/expression/WrappedIQuery.java2
4 files changed, 2 insertions, 21 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ql/.settings/.api_filters b/bundles/org.eclipse.equinox.p2.ql/.settings/.api_filters
index dfbf53e91..0fa1636b7 100644
--- a/bundles/org.eclipse.equinox.p2.ql/.settings/.api_filters
+++ b/bundles/org.eclipse.equinox.p2.ql/.settings/.api_filters
@@ -9,20 +9,4 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/equinox/p2/ql/QLMatchQuery.java" type="org.eclipse.equinox.p2.ql.QLMatchQuery">
- <filter id="574619656">
- <message_arguments>
- <message_argument value="IMatchQuery&lt;T&gt;"/>
- <message_argument value="QLMatchQuery&lt;T&gt;"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/equinox/p2/ql/QLQuery.java" type="org.eclipse.equinox.p2.ql.QLQuery">
- <filter id="574619656">
- <message_arguments>
- <message_argument value="IQuery&lt;T&gt;"/>
- <message_argument value="QLQuery&lt;T&gt;"/>
- </message_arguments>
- </filter>
- </resource>
</component>
diff --git a/bundles/org.eclipse.equinox.p2.ql/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ql/META-INF/MANIFEST.MF
index 6826d41b8..0b7a3fc7a 100644
--- a/bundles/org.eclipse.equinox.p2.ql/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ql/META-INF/MANIFEST.MF
@@ -20,6 +20,7 @@ Import-Package: org.eclipse.equinox.internal.p2.core.helpers,
org.eclipse.equinox.internal.p2.metadata.expression,
org.eclipse.equinox.internal.p2.metadata.expression.parser,
org.eclipse.equinox.internal.p2.metadata.index,
+ org.eclipse.equinox.internal.p2.metadata.query,
org.eclipse.equinox.internal.provisional.p2.metadata,
org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",
org.eclipse.equinox.p2.engine;version="[2.0.0,3.0.0)",
diff --git a/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/internal/p2/ql/expression/QLFactory.java b/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/internal/p2/ql/expression/QLFactory.java
index 29ce73ad2..cf075a44a 100644
--- a/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/internal/p2/ql/expression/QLFactory.java
+++ b/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/internal/p2/ql/expression/QLFactory.java
@@ -55,10 +55,6 @@ public class QLFactory extends ExpressionFactory implements IQLFactory, IQLConst
return new Condition((Expression) test, (Expression) ifTrue, (Expression) ifFalse);
}
- public <T> org.eclipse.equinox.p2.metadata.expression.IContextExpression<T> contextExpression(IExpression expr, Object... parameters) {
- return new ContextExpression<T>((Expression) expr, parameters);
- }
-
public IExpression first(IExpression collection, IExpression lambda) {
return new First((Expression) collection, (LambdaExpression) lambda);
}
diff --git a/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/internal/p2/ql/expression/WrappedIQuery.java b/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/internal/p2/ql/expression/WrappedIQuery.java
index ccad2e0e8..b899da5bc 100644
--- a/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/internal/p2/ql/expression/WrappedIQuery.java
+++ b/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/internal/p2/ql/expression/WrappedIQuery.java
@@ -12,8 +12,8 @@ package org.eclipse.equinox.internal.p2.ql.expression;
import java.util.Iterator;
import org.eclipse.equinox.internal.p2.metadata.expression.*;
+import org.eclipse.equinox.internal.p2.metadata.query.IMatchQuery;
import org.eclipse.equinox.p2.metadata.expression.IEvaluationContext;
-import org.eclipse.equinox.p2.query.IMatchQuery;
import org.eclipse.equinox.p2.query.IQuery;
public final class WrappedIQuery extends Function implements IQLConstants {

Back to the top