Attachment 151131 Details for Bug 293339 – Updated patch

[patch] Updated patch

clipboard.txt (text/plain), 127.63 KB, created by Ian Bull

on 2009-11-02 17:21:57 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Bull

Created: 2009-11-02 17:21:57 EST

Size: 127.63 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.internal.p2.ui.analysis
>Index: src/org/eclipse/equinox/internal/p2/ui/analysis/model/ForeignProfile.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/incubator/p2/bundles/org.eclipse.equinox.internal.p2.ui.analysis/src/org/eclipse/equinox/internal/p2/ui/analysis/model/ForeignProfile.java,v
>retrieving revision 1.3
>diff -u -r1.3 ForeignProfile.java
>--- src/org/eclipse/equinox/internal/p2/ui/analysis/model/ForeignProfile.java	8 Oct 2009 13:32:06 -0000	1.3
>+++ src/org/eclipse/equinox/internal/p2/ui/analysis/model/ForeignProfile.java	2 Nov 2009 22:23:47 -0000
>@@ -28,7 +28,7 @@
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQueryable;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> import org.eclipse.osgi.util.NLS;
> import org.osgi.framework.BundleContext;
> import org.xml.sax.InputSource;
>@@ -58,7 +58,7 @@
> 		return profileFile;
> 	}
> 
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		return profile.query(query, collector, monitor);
> 	}
> 
>@@ -234,7 +234,7 @@
> 		}
> 	}
> 
>-	public Collector available(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector available(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		return profile.available(query, collector, monitor);
> 	}
> 
>Index: src/org/eclipse/equinox/internal/p2/ui/analysis/model/ForeignProfiles.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/incubator/p2/bundles/org.eclipse.equinox.internal.p2.ui.analysis/src/org/eclipse/equinox/internal/p2/ui/analysis/model/ForeignProfiles.java,v
>retrieving revision 1.2
>diff -u -r1.2 ForeignProfiles.java
>--- src/org/eclipse/equinox/internal/p2/ui/analysis/model/ForeignProfiles.java	7 Oct 2009 14:59:44 -0000	1.2
>+++ src/org/eclipse/equinox/internal/p2/ui/analysis/model/ForeignProfiles.java	2 Nov 2009 22:23:47 -0000
>@@ -13,7 +13,7 @@
> import org.eclipse.equinox.internal.provisional.p2.engine.ProfileEvent;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQueryable;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> public class ForeignProfiles implements IQueryable {
> 
>@@ -39,7 +39,7 @@
> 		return (ForeignProfile) profileMap.get(profileid);
> 	}
> 
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		List profiles = new ArrayList(profileMap.size());
> 		Iterator keys = profileMap.keySet().iterator();
> 
>#P org.eclipse.equinox.p2.console
>Index: src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java,v
>retrieving revision 1.19
>diff -u -r1.19 ProvCommandProvider.java
>--- src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java	8 Oct 2009 13:32:17 -0000	1.19
>+++ src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java	2 Nov 2009 22:23:48 -0000
>@@ -238,7 +238,7 @@
> 			if (queryable == null)
> 				return;
> 		}
>-		Query query = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_GROUP, Boolean.TRUE.toString());
>+		IQuery query = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_GROUP, Boolean.TRUE.toString());
> 		IInstallableUnit[] units = sort(queryable.query(query, new Collector(), null));
> 		for (int i = 0; i < units.length; i++)
> 			println(interpreter, units[i]);
>Index: src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java,v
>retrieving revision 1.48.2.1
>diff -u -r1.48.2.1 ProvisioningHelper.java
>--- src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java	22 Oct 2009 01:03:59 -0000	1.48.2.1
>+++ src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java	2 Nov 2009 22:23:48 -0000
>@@ -151,11 +151,11 @@
> 	 * @param monitor A progress monitor, or <code>null</code>
> 	 * @return The IUs that match the query
> 	 */
>-	public static Collector getInstallableUnits(URI location, Query query, IProgressMonitor monitor) {
>+	public static Collector getInstallableUnits(URI location, IQuery query, IProgressMonitor monitor) {
> 		return getInstallableUnits(location, query, new Collector(), monitor);
> 	}
> 
>-	public static Collector getInstallableUnits(URI location, Query query, Collector collector, IProgressMonitor monitor) {
>+	public static Collector getInstallableUnits(URI location, IQuery query, Collector collector, IProgressMonitor monitor) {
> 		IQueryable queryable = null;
> 		if (location == null) {
> 			queryable = (IQueryable) ServiceHelper.getService(Activator.getContext(), IMetadataRepositoryManager.class.getName());
>#P org.eclipse.equinox.p2.director
>Index: src/org/eclipse/equinox/internal/p2/director/ApplicablePatchQuery.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/ApplicablePatchQuery.java,v
>retrieving revision 1.9
>diff -u -r1.9 ApplicablePatchQuery.java
>--- src/org/eclipse/equinox/internal/p2/director/ApplicablePatchQuery.java	6 Oct 2009 21:25:29 -0000	1.9
>+++ src/org/eclipse/equinox/internal/p2/director/ApplicablePatchQuery.java	2 Nov 2009 22:23:49 -0000
>@@ -11,7 +11,7 @@
> package org.eclipse.equinox.internal.p2.director;
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.*;
> 
>@@ -23,7 +23,7 @@
> 	/**
> 	 * A query that matches any patch.
> 	 */
>-	public static final Query ANY = new MatchQuery() {
>+	public static final IQuery ANY = new MatchQuery() {
> 		public boolean isMatch(Object candidate) {
> 			return candidate instanceof IInstallableUnitPatch;
> 		}
>Index: src/org/eclipse/equinox/internal/p2/director/QueryableArray.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/QueryableArray.java,v
>retrieving revision 1.9
>diff -u -r1.9 QueryableArray.java
>--- src/org/eclipse/equinox/internal/p2/director/QueryableArray.java	14 Oct 2009 02:26:21 -0000	1.9
>+++ src/org/eclipse/equinox/internal/p2/director/QueryableArray.java	2 Nov 2009 22:23:49 -0000
>@@ -34,7 +34,7 @@
> 		dataSet = Arrays.asList(ius);
> 	}
> 
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		if (query instanceof CapabilityQuery)
> 			return queryCapability((CapabilityQuery) query, collector, monitor);
> 		return query.perform(dataSet.iterator(), collector);
>Index: src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java,v
>retrieving revision 1.92
>diff -u -r1.92 SimplePlanner.java
>--- src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java	20 Oct 2009 18:17:29 -0000	1.92
>+++ src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java	2 Nov 2009 22:23:50 -0000
>@@ -201,7 +201,7 @@
> 	}
> 
> 	public static IInstallableUnit[] findPlannerMarkedIUs(final IProfile profile) {
>-		Query markerQuery = new MatchQuery() {
>+		IQuery markerQuery = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (!(candidate instanceof IInstallableUnit))
> 					return false;
>@@ -718,7 +718,7 @@
> 			profile = p;
> 		}
> 
>-		public Collector available(Query query, Collector collector, IProgressMonitor monitor) {
>+		public Collector available(IQuery query, Collector collector, IProgressMonitor monitor) {
> 			return profile.available(query, collector, monitor);
> 		}
> 
>@@ -772,7 +772,7 @@
> 			return profile.isRootProfile();
> 		}
> 
>-		public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+		public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 			return profile.query(query, collector, monitor);
> 		}
> 	}
>Index: src/org/eclipse/equinox/internal/provisional/p2/director/ProvisioningPlan.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/ProvisioningPlan.java,v
>retrieving revision 1.12
>diff -u -r1.12 ProvisioningPlan.java
>--- src/org/eclipse/equinox/internal/provisional/p2/director/ProvisioningPlan.java	6 Oct 2009 21:25:28 -0000	1.12
>+++ src/org/eclipse/equinox/internal/provisional/p2/director/ProvisioningPlan.java	2 Nov 2009 22:23:50 -0000
>@@ -96,7 +96,7 @@
> 			this.addition = add;
> 		}
> 
>-		public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+		public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 			if (operands == null || status.getSeverity() == IStatus.ERROR)
> 				return collector;
> 			Collection list = new ArrayList();
>#P org.eclipse.equinox.p2.director.app
>Index: src/org/eclipse/equinox/internal/p2/director/app/Application.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java,v
>retrieving revision 1.57.2.2
>diff -u -r1.57.2.2 Application.java
>--- src/org/eclipse/equinox/internal/p2/director/app/Application.java	29 Oct 2009 22:52:21 -0000	1.57.2.2
>+++ src/org/eclipse/equinox/internal/p2/director/app/Application.java	2 Nov 2009 22:23:50 -0000
>@@ -405,7 +405,7 @@
> 
> 					IProfile profile = initializeProfile();
> 					query = new InstallableUnitQuery(root, version == null ? VersionRange.emptyRange : new VersionRange(version, true, version, true));
>-					roots = collectRootIUs(metadataRepositoryLocations, new PipedQuery(new Query[] {query, new LatestIUVersionQuery()}), new Collector());
>+					roots = collectRootIUs(metadataRepositoryLocations, new PipedQuery(new IQuery[] {query, new LatestIUVersionQuery()}), new Collector());
> 					if (roots.size() <= 0)
> 						roots = profile.query(query, roots, new NullProgressMonitor());
> 					if (roots.size() <= 0) {
>@@ -484,12 +484,12 @@
> 			this.location = location;
> 		}
> 
>-		public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+		public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 			return ProvisioningHelper.getInstallableUnits(location, query, collector, monitor);
> 		}
> 	}
> 
>-	private Collector collectRootIUs(URI[] locations, Query query, Collector collector) {
>+	private Collector collectRootIUs(URI[] locations, IQuery query, Collector collector) {
> 		IProgressMonitor nullMonitor = new NullProgressMonitor();
> 
> 		if (locations == null || locations.length == 0)
>Index: src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java,v
>retrieving revision 1.16.2.2
>diff -u -r1.16.2.2 DirectorApplication.java
>--- src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java	29 Oct 2009 22:52:21 -0000	1.16.2.2
>+++ src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java	2 Nov 2009 22:23:51 -0000
>@@ -51,7 +51,7 @@
> 			Assert.isNotNull(location);
> 		}
> 
>-		public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+		public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 			return getInstallableUnits(location, query, collector, monitor);
> 		}
> 	}
>@@ -225,7 +225,7 @@
> 		}
> 	}
> 
>-	private Collector collectRootIUs(Query query, Collector collector) {
>+	private Collector collectRootIUs(IQuery query, Collector collector) {
> 		IProgressMonitor nullMonitor = new NullProgressMonitor();
> 
> 		int top = metadataRepositoryLocations.size();
>@@ -245,10 +245,10 @@
> 		for (int i = 0; i < top; ++i) {
> 			IVersionedId rootName = (IVersionedId) rootNames.get(i);
> 			Version v = rootName.getVersion();
>-			Query query = new InstallableUnitQuery(rootName.getId(), Version.emptyVersion.equals(v) ? VersionRange.emptyRange : new VersionRange(v, true, v, true));
>+			IQuery query = new InstallableUnitQuery(rootName.getId(), Version.emptyVersion.equals(v) ? VersionRange.emptyRange : new VersionRange(v, true, v, true));
> 			Collector roots;
> 			if (forInstall)
>-				roots = collectRootIUs(new PipedQuery(new Query[] {query, new LatestIUVersionQuery()}), new Collector());
>+				roots = collectRootIUs(new PipedQuery(new IQuery[] {query, new LatestIUVersionQuery()}), new Collector());
> 			else
> 				roots = new Collector();
> 			if (roots.size() <= 0)
>@@ -471,7 +471,7 @@
> 			while (r.hasNext()) {
> 				IVersionedId rootName = (IVersionedId) r.next();
> 				Version v = rootName.getVersion();
>-				Query query = new InstallableUnitQuery(rootName.getId(), Version.emptyVersion.equals(v) ? VersionRange.emptyRange : new VersionRange(v, true, v, true));
>+				IQuery query = new InstallableUnitQuery(rootName.getId(), Version.emptyVersion.equals(v) ? VersionRange.emptyRange : new VersionRange(v, true, v, true));
> 				Collector roots = collectRootIUs(query, null);
> 				allRoots.addAll(roots.toCollection());
> 			}
>@@ -773,7 +773,7 @@
> 			strm.print(' ');
> 	}
> 
>-	Collector getInstallableUnits(URI location, Query query, Collector collector, IProgressMonitor monitor) {
>+	Collector getInstallableUnits(URI location, IQuery query, Collector collector, IProgressMonitor monitor) {
> 		IQueryable queryable = null;
> 		if (location == null) {
> 			queryable = metadataManager;
>#P org.eclipse.equinox.p2.engine
>Index: src/org/eclipse/equinox/internal/p2/engine/Profile.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Profile.java,v
>retrieving revision 1.15
>diff -u -r1.15 Profile.java
>--- src/org/eclipse/equinox/internal/p2/engine/Profile.java	6 Oct 2009 21:25:24 -0000	1.15
>+++ src/org/eclipse/equinox/internal/p2/engine/Profile.java	2 Nov 2009 22:23:53 -0000
>@@ -157,7 +157,7 @@
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#query(org.eclipse.equinox.internal.provisional.p2.query.Query, org.eclipse.equinox.internal.provisional.p2.query.Collector, org.eclipse.core.runtime.IProgressMonitor)
> 	 */
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		if (query instanceof IUProfilePropertyQuery) {
> 			((IUProfilePropertyQuery) query).setProfile(this);
> 			return query.perform(iuProperties.keySet().iterator(), collector);
>@@ -165,7 +165,7 @@
> 		return query.perform(ius.iterator(), collector);
> 	}
> 
>-	public Collector available(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector available(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		if (surrogateProfileHandler != null)
> 			return surrogateProfileHandler.queryProfile(this, query, collector, monitor);
> 		return query(query, collector, monitor);
>Index: src/org/eclipse/equinox/internal/p2/engine/ProfileMetadataRepository.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileMetadataRepository.java,v
>retrieving revision 1.10
>diff -u -r1.10 ProfileMetadataRepository.java
>--- src/org/eclipse/equinox/internal/p2/engine/ProfileMetadataRepository.java	6 Oct 2009 21:25:24 -0000	1.10
>+++ src/org/eclipse/equinox/internal/p2/engine/ProfileMetadataRepository.java	2 Nov 2009 22:23:53 -0000
>@@ -22,7 +22,7 @@
> import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
> import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
> import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
> import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.AbstractMetadataRepository;
>@@ -155,7 +155,7 @@
> 		// nothing to do
> 	}
> 
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		return profile.query(query, collector, monitor);
> 	}
> 
>Index: src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java,v
>retrieving revision 1.12
>diff -u -r1.12 SurrogateProfileHandler.java
>--- src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java	6 Oct 2009 21:25:24 -0000	1.12
>+++ src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java	2 Nov 2009 22:23:53 -0000
>@@ -44,7 +44,7 @@
> 	private SoftReference cachedProfile;
> 
> 	private static void addSharedProfileBaseIUs(final IProfile sharedProfile, final Profile userProfile) {
>-		Query rootIUQuery = new MatchQuery() {
>+		IQuery rootIUQuery = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (candidate instanceof IInstallableUnit) {
> 					IInstallableUnit iu = (IInstallableUnit) candidate;
>@@ -67,7 +67,7 @@
> 	}
> 
> 	private static void removeUserProfileBaseIUs(final Profile userProfile) {
>-		Query rootIUQuery = new MatchQuery() {
>+		IQuery rootIUQuery = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (candidate instanceof IInstallableUnit) {
> 					IInstallableUnit iu = (IInstallableUnit) candidate;
>@@ -85,7 +85,7 @@
> 	}
> 
> 	private static void markRootsOptional(final Profile userProfile) {
>-		Query rootIUQuery = new MatchQuery() {
>+		IQuery rootIUQuery = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (candidate instanceof IInstallableUnit) {
> 					IInstallableUnit iu = (IInstallableUnit) candidate;
>@@ -195,7 +195,7 @@
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.equinox.internal.p2.engine.ISurrogateProfileHandler#queryProfile(org.eclipse.equinox.internal.provisional.p2.engine.IProfile, org.eclipse.equinox.internal.provisional.p2.query.Query, org.eclipse.equinox.internal.provisional.p2.query.Collector, org.eclipse.core.runtime.IProgressMonitor)
> 	 */
>-	public Collector queryProfile(IProfile profile, Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector queryProfile(IProfile profile, IQuery query, Collector collector, IProgressMonitor monitor) {
> 		IProfile sharedProfile = getSharedProfile(profile.getProfileId());
> 		if (sharedProfile != null)
> 			sharedProfile.query(query, collector, monitor);
>Index: src/org/eclipse/equinox/internal/provisional/p2/engine/IProfile.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfile.java,v
>retrieving revision 1.12
>diff -u -r1.12 IProfile.java
>--- src/org/eclipse/equinox/internal/provisional/p2/engine/IProfile.java	6 Oct 2009 21:25:24 -0000	1.12
>+++ src/org/eclipse/equinox/internal/provisional/p2/engine/IProfile.java	2 Nov 2009 22:23:53 -0000
>@@ -126,6 +126,6 @@
> 
> 	public long getTimestamp();
> 
>-	public Collector available(Query query, Collector collector, IProgressMonitor monitor);
>+	public Collector available(IQuery query, Collector collector, IProgressMonitor monitor);
> 
> }
>\ No newline at end of file
>Index: src/org/eclipse/equinox/internal/provisional/p2/engine/ISurrogateProfileHandler.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/ISurrogateProfileHandler.java,v
>retrieving revision 1.6
>diff -u -r1.6 ISurrogateProfileHandler.java
>--- src/org/eclipse/equinox/internal/provisional/p2/engine/ISurrogateProfileHandler.java	6 Oct 2009 21:25:24 -0000	1.6
>+++ src/org/eclipse/equinox/internal/provisional/p2/engine/ISurrogateProfileHandler.java	2 Nov 2009 22:23:53 -0000
>@@ -12,7 +12,7 @@
> 
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> public interface ISurrogateProfileHandler {
> 
>@@ -20,7 +20,7 @@
> 
> 	public abstract boolean isSurrogate(IProfile profile);
> 
>-	public abstract Collector queryProfile(IProfile profile, Query query, Collector collector, IProgressMonitor monitor);
>+	public abstract Collector queryProfile(IProfile profile, IQuery query, Collector collector, IProgressMonitor monitor);
> 
> 	public abstract boolean updateProfile(IProfile selfProfile);
> 
>#P org.eclipse.equinox.p2.extensionlocation
>Index: src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java,v
>retrieving revision 1.29
>diff -u -r1.29 ExtensionLocationMetadataRepository.java
>--- src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java	6 Oct 2009 21:25:30 -0000	1.29
>+++ src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java	2 Nov 2009 22:23:54 -0000
>@@ -19,7 +19,7 @@
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
> import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.AbstractMetadataRepository;
> import org.eclipse.osgi.util.NLS;
>@@ -96,14 +96,14 @@
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository#removeInstallableUnits(org.eclipse.equinox.internal.provisional.p2.query.Query, org.eclipse.core.runtime.IProgressMonitor)
> 	 */
>-	public boolean removeInstallableUnits(Query query, IProgressMonitor monitor) {
>+	public boolean removeInstallableUnits(IQuery query, IProgressMonitor monitor) {
> 		throw new UnsupportedOperationException();
> 	}
> 
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.equinox.internal.provisional.p2.query.IQueryable#query(org.eclipse.equinox.internal.provisional.p2.query.Query, org.eclipse.equinox.internal.provisional.p2.query.Collector, org.eclipse.core.runtime.IProgressMonitor)
> 	 */
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		ensureInitialized();
> 		return metadataRepository.query(query, collector, monitor);
> 	}
>#P org.eclipse.equinox.p2.installer
>Index: src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java,v
>retrieving revision 1.38
>diff -u -r1.38 InstallUpdateProductOperation.java
>--- src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java	14 Oct 2009 02:52:03 -0000	1.38
>+++ src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java	2 Nov 2009 22:23:54 -0000
>@@ -150,7 +150,7 @@
> 		VersionRange range = VersionRange.emptyRange;
> 		if (version != null && !version.equals(Version.emptyVersion))
> 			range = new VersionRange(version, true, version, true);
>-		Query query = new InstallableUnitQuery(id, range);
>+		IQuery query = new InstallableUnitQuery(id, range);
> 		Collector collector = new Collector();
> 		Iterator matches = metadataRepoMan.query(query, collector, null).iterator();
> 		// pick the newest match
>#P org.eclipse.equinox.p2.metadata
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/Collector.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/Collector.java,v
>retrieving revision 1.2
>diff -u -r1.2 Collector.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/query/Collector.java	8 Oct 2009 13:32:18 -0000	1.2
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/query/Collector.java	2 Nov 2009 22:23:55 -0000
>@@ -121,7 +121,7 @@
> 	/**
> 	 * Performs a query on this results of this collector. 
> 	 */
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		Iterator iter = collector == this ? toCollection().iterator() : iterator();
> 		if (monitor == null)
> 			monitor = new NullProgressMonitor();
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CompoundQuery.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CompoundQuery.java,v
>retrieving revision 1.1
>diff -u -r1.1 CompoundQuery.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CompoundQuery.java	6 Oct 2009 21:25:26 -0000	1.1
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CompoundQuery.java	2 Nov 2009 22:23:55 -0000
>@@ -20,15 +20,15 @@
> * In a CompoundQuery each sub-query is executed and the results are combined using
> * either logical AND or logical OR operations. 
> * 
>- * Clients are expected to call {@link CompoundQuery#createCompoundQuery(Query[], boolean)}
>+ * Clients are expected to call {@link CompoundQuery#createCompoundQuery(IQuery[], boolean)}
> * to create a concrete instance of a CompoundQuery. If all Queries are instances of 
> * {@link IMatchQuery} then the resulting compound query will be a MatchCompoundQuery, otherwise the
> * resulting compound query will be a {@link ContextQuery}.
> * 
> * @noextend This class is not intended to be subclassed by clients.
> */
>-public abstract class CompoundQuery implements Query {
>-	protected Query[] queries;
>+public abstract class CompoundQuery implements IQuery {
>+	protected IQuery[] queries;
> 	protected boolean and;
> 
> 	/**
>@@ -45,7 +45,7 @@
> 	 * @param and <code>true</code> if this query represents a logical 'and', and
> 	 * <code>false</code> if this query represents a logical 'or'.
> 	 */
>-	public static CompoundQuery createCompoundQuery(Query[] queries, boolean and) {
>+	public static CompoundQuery createCompoundQuery(IQuery[] queries, boolean and) {
> 		if (isMatchQueries(queries)) {
> 			return new CompoundQuery.MatchCompoundQuery(queries, and);
> 		}
>@@ -55,7 +55,7 @@
> 	/**
> 	 * Returns the queries that make up this compound query
> 	 */
>-	public Query[] getQueries() {
>+	public IQuery[] getQueries() {
> 		return queries;
> 	}
> 
>@@ -69,7 +69,7 @@
> 		return and;
> 	}
> 
>-	protected CompoundQuery(Query[] queries, boolean and) {
>+	protected CompoundQuery(IQuery[] queries, boolean and) {
> 		this.queries = queries;
> 		this.and = and;
> 	}
>@@ -77,7 +77,7 @@
> 	/**
> 	 * @param queries
> 	 */
>-	private static boolean isMatchQueries(Query[] queries) {
>+	private static boolean isMatchQueries(IQuery[] queries) {
> 		for (int i = 0; i < queries.length; i++) {
> 			if (!(queries[i] instanceof IMatchQuery)) {
> 				return false;
>@@ -106,7 +106,7 @@
> 	 */
> 	private static class MatchCompoundQuery extends CompoundQuery implements IMatchQuery {
> 
>-		protected MatchCompoundQuery(Query[] queries, boolean and) {
>+		protected MatchCompoundQuery(IQuery[] queries, boolean and) {
> 			super(queries, and);
> 		}
> 
>@@ -164,7 +164,7 @@
> 	 */
> 	private static class ContextCompoundQuery extends CompoundQuery {
> 
>-		protected ContextCompoundQuery(Query[] queries, boolean and) {
>+		protected ContextCompoundQuery(IQuery[] queries, boolean and) {
> 			super(queries, and);
> 		}
> 
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CompoundQueryable.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CompoundQueryable.java,v
>retrieving revision 1.1
>diff -u -r1.1 CompoundQueryable.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CompoundQueryable.java	6 Oct 2009 21:25:26 -0000	1.1
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CompoundQueryable.java	2 Nov 2009 22:23:55 -0000
>@@ -25,7 +25,7 @@
> 		this.queryables = queryables;
> 	}
> 
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		if (monitor == null) {
> 			monitor = new NullProgressMonitor();
> 		}
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/ContextQuery.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/ContextQuery.java,v
>retrieving revision 1.1
>diff -u -r1.1 ContextQuery.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/query/ContextQuery.java	6 Oct 2009 21:25:25 -0000	1.1
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/query/ContextQuery.java	2 Nov 2009 22:23:55 -0000
>@@ -31,7 +31,7 @@
> * execution of the query. 
> * 
> */
>-public abstract class ContextQuery implements Query {
>+public abstract class ContextQuery implements IQuery {
> 
> 	/**
> 	 * Evaluates the query for a specific input. 
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IMatchQuery.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IMatchQuery.java,v
>retrieving revision 1.1
>diff -u -r1.1 IMatchQuery.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IMatchQuery.java	6 Oct 2009 21:25:25 -0000	1.1
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IMatchQuery.java	2 Nov 2009 22:23:55 -0000
>@@ -17,7 +17,7 @@
> * 
> * @spi Clients should not implement this interface, but rather extend {@link MatchQuery}.
> */
>-public interface IMatchQuery extends Query {
>+public interface IMatchQuery extends IQuery {
> 
> 	/**
> 	 * Returns whether the given object satisfies the parameters of this query.
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IQuery.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IQuery.java
>diff -N src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IQuery.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IQuery.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,46 @@
>+/*******************************************************************************
>+ * Copyright (c) 2007, 2009 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM Corporation - initial API and implementation
>+ * EclipseSource - ongoing development
>+ *******************************************************************************/
>+package org.eclipse.equinox.internal.provisional.p2.metadata.query;
>+
>+import java.util.Iterator;
>+
>+/**
>+ * The superclass of all queries that can be performed on an {@link IQueryable}.
>+ * 
>+ * 
>+ * @noimplement This interface is not intended to be implemented by clients.
>+ * @noextend This interface is not intended to be extended by clients.
>+ */
>+public interface IQuery {
>+
>+	/**
>+	 * Evaluates the query for a specific input. 
>+	 * 
>+	 * @param iterator The elements for which to evaluate the query on
>+	 * @param result A collector to collect the results. For each element accepted 
>+	 * by the query,{@link Collector#accept(Object)} must be called.
>+	 * @return The results of the query. The collector returned must be
>+	 * the collector passed in.
>+	 */
>+	public abstract Collector perform(Iterator iterator, Collector result);
>+
>+	/**
>+	 * Gets the ID for this Query. 
>+	 */
>+	public String getId();
>+
>+	/**
>+	 * Gets a particular property of the query.
>+	 * @param property The property to retrieve 
>+	 */
>+	public Object getProperty(String property);
>+}
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IQueryable.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IQueryable.java,v
>retrieving revision 1.1
>diff -u -r1.1 IQueryable.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IQueryable.java	6 Oct 2009 21:25:26 -0000	1.1
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IQueryable.java	2 Nov 2009 22:23:56 -0000
>@@ -33,5 +33,5 @@
> 	 * reporting is not desired
> 	 * @return The collector argument
> 	 */
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor);
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor);
> }
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/PipedQuery.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/Attic/PipedQuery.java,v
>retrieving revision 1.1.2.1
>diff -u -r1.1.2.1 PipedQuery.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/query/PipedQuery.java	29 Oct 2009 22:52:52 -0000	1.1.2.1
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/query/PipedQuery.java	2 Nov 2009 22:23:56 -0000
>@@ -16,10 +16,10 @@
> * is executed in succession. The results from the ith sub-query
> * are piped as input into the i+1th sub-query.
> */
>-public class PipedQuery implements Query {
>-	protected Query[] queries;
>+public class PipedQuery implements IQuery {
>+	protected IQuery[] queries;
> 
>-	public PipedQuery(Query[] queries) {
>+	public PipedQuery(IQuery[] queries) {
> 		this.queries = queries;
> 	}
> 
>@@ -42,7 +42,7 @@
> 	 * Set the queries of this composite. This is needed to allow subclasses of 
> 	 * CompsiteQuery to set the queries in a constructor
> 	 */
>-	protected final void setQueries(Query[] queries) {
>+	protected final void setQueries(IQuery[] queries) {
> 		this.queries = queries;
> 	}
> 
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/Query.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/Query.java
>diff -N src/org/eclipse/equinox/internal/provisional/p2/metadata/query/Query.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/query/Query.java	6 Oct 2009 21:25:25 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,50 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2007, 2009 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * IBM Corporation - initial API and implementation
>- * EclipseSource - ongoing development
>- *******************************************************************************/
>-package org.eclipse.equinox.internal.provisional.p2.metadata.query;
>-
>-
>-import java.util.Iterator;
>-
>-/**
>- * The superclass of all queries that can be performed on an {@link IQueryable}.
>- * 
>- * 
>- * NOTE: This interface does not follow the proper naming convention. It should 
>- * be IQuery, however, for historic reasons it is Query. This is likely to change.
>- * 
>- * @noimplement This interface is not intended to be implemented by clients.
>- * @noextend This interface is not intended to be extended by clients.
>- */
>-public interface Query {
>-
>-	/**
>-	 * Evaluates the query for a specific input. 
>-	 * 
>-	 * @param iterator The elements for which to evaluate the query on
>-	 * @param result A collector to collect the results. For each element accepted 
>-	 * by the query,{@link Collector#accept(Object)} must be called.
>-	 * @return The results of the query. The collector returned must be
>-	 * the collector passed in.
>-	 */
>-	public abstract Collector perform(Iterator iterator, Collector result);
>-
>-	/**
>-	 * Gets the ID for this Query. 
>-	 */
>-	public String getId();
>-
>-	/**
>-	 * Gets a particular property of the query.
>-	 * @param property The property to retrieve 
>-	 */
>-	public Object getProperty(String property);
>-}
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/QueryHelpers.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/QueryHelpers.java,v
>retrieving revision 1.1
>diff -u -r1.1 QueryHelpers.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/query/QueryHelpers.java	6 Oct 2009 21:25:26 -0000	1.1
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/query/QueryHelpers.java	2 Nov 2009 22:23:56 -0000
>@@ -9,18 +9,21 @@
> ******************************************************************************/
> package org.eclipse.equinox.internal.provisional.p2.metadata.query;
> 
>-
> import java.lang.reflect.InvocationTargetException;
> import java.lang.reflect.Method;
> 
> /**
> * Static helper methods for the Query API.
>+ * 
>+ * @noextend This class is not intended to be subclassed by clients.
> */
> public class QueryHelpers {
> 	/**
> 	 * Gets the ID for a Query. 
>+	 * 
>+	 * @noreference This method is not intended to be referenced by clients.
> 	 */
>-	public static String getId(Query query) {
>+	public static String getId(IQuery query) {
> 		return query.getClass().getName();
> 	}
> 
>@@ -28,8 +31,10 @@
> 	 * Gets a particular property of a query.
> 	 * @param query The query to retrieve the property from
> 	 * @param property The property to retrieve 
>+	 * 
>+	 * @noreference This method is not intended to be referenced by clients.
> 	 */
>-	public static Object getProperty(Query query, String property) {
>+	public static Object getProperty(IQuery query, String property) {
> 		Class clazz = query.getClass();
> 		Object result = null;
> 		try {
>#P org.eclipse.equinox.p2.metadata.generator
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java,v
>retrieving revision 1.86.2.1
>diff -u -r1.86.2.1 Generator.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java	22 Oct 2009 01:02:55 -0000	1.86.2.1
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java	2 Nov 2009 22:23:57 -0000
>@@ -520,7 +520,7 @@
> 		}
> 
> 		//Query the repo
>-		Query query = new InstallableUnitQuery(name);
>+		IQuery query = new InstallableUnitQuery(name);
> 		Collector collector = new Collector();
> 		Iterator matches = info.getMetadataRepository().query(query, collector, null).iterator();
> 		//pick the newest match
>@@ -635,7 +635,7 @@
> 			if (configuredIU == null) {
> 				if (!generateRootIU && data == null)
> 					continue;
>-				Query query = new InstallableUnitQuery(bundle.getSymbolicName());
>+				IQuery query = new InstallableUnitQuery(bundle.getSymbolicName());
> 				Collector collector = new Collector();
> 				IMetadataRepository metadataRepository = info.getMetadataRepository();
> 				if (metadataRepository == null)
>#P org.eclipse.equinox.p2.metadata.repository
>Index: src/org/eclipse/equinox/internal/p2/metadata/mirror/Mirroring.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/mirror/Mirroring.java,v
>retrieving revision 1.2
>diff -u -r1.2 Mirroring.java
>--- src/org/eclipse/equinox/internal/p2/metadata/mirror/Mirroring.java	6 Oct 2009 21:25:19 -0000	1.2
>+++ src/org/eclipse/equinox/internal/p2/metadata/mirror/Mirroring.java	2 Nov 2009 22:23:58 -0000
>@@ -12,7 +12,7 @@
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
> 
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
>@@ -43,7 +43,7 @@
> 		}
> 	}
> 
>-	public void mirror(IMetadataRepository source, IMetadataRepository destination, Query query, boolean transitive) {
>+	public void mirror(IMetadataRepository source, IMetadataRepository destination, IQuery query, boolean transitive) {
> 		validate(source, destination);
> 		Collector result = source.query(query, new Collector(), null);
> 		mirror(source, destination, (IInstallableUnit[]) result.toArray(IInstallableUnit.class), transitive);
>Index: src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java,v
>retrieving revision 1.14
>diff -u -r1.14 CompositeMetadataRepository.java
>--- src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java	6 Oct 2009 21:25:19 -0000	1.14
>+++ src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java	2 Nov 2009 22:23:58 -0000
>@@ -118,7 +118,7 @@
> 		return result;
> 	}
> 
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		if (monitor == null)
> 			monitor = new NullProgressMonitor();
> 		try {
>@@ -200,7 +200,7 @@
> 		throw new UnsupportedOperationException("Cannot remove IUs to a composite repository");
> 	}
> 
>-	public synchronized boolean removeInstallableUnits(Query query, IProgressMonitor monitor) {
>+	public synchronized boolean removeInstallableUnits(IQuery query, IProgressMonitor monitor) {
> 		throw new UnsupportedOperationException("Cannot remove IUs to a composite repository");
> 	}
> 
>Index: src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java,v
>retrieving revision 1.38
>diff -u -r1.38 LocalMetadataRepository.java
>--- src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java	6 Oct 2009 21:25:19 -0000	1.38
>+++ src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java	2 Nov 2009 22:23:58 -0000
>@@ -13,7 +13,7 @@
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
> 
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
> import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
>@@ -146,7 +146,7 @@
> 		return true;
> 	}
> 
>-	public synchronized Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public synchronized Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		return query.perform(units.iterator(), collector);
> 	}
> 
>@@ -155,7 +155,7 @@
> 		save();
> 	}
> 
>-	public synchronized boolean removeInstallableUnits(Query query, IProgressMonitor monitor) {
>+	public synchronized boolean removeInstallableUnits(IQuery query, IProgressMonitor monitor) {
> 		boolean changed = false;
> 		Collector results = query.perform(units.iterator(), new Collector());
> 		if (results.size() > 0) {
>Index: src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java,v
>retrieving revision 1.60
>diff -u -r1.60 MetadataRepositoryManager.java
>--- src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java	6 Oct 2009 21:25:19 -0000	1.60
>+++ src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java	2 Nov 2009 22:23:58 -0000
>@@ -112,7 +112,7 @@
> 	 * reporting is not desired
> 	 * @return The collector argument
> 	 */
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		URI[] locations = getKnownRepositories(REPOSITORIES_ALL);
> 		List queryables = new ArrayList(locations.length); // use a list since we don't know exactly how many will load
> 		SubMonitor sub = SubMonitor.convert(monitor, locations.length * 10);
>Index: src/org/eclipse/equinox/internal/p2/metadata/repository/URLMetadataRepository.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/URLMetadataRepository.java,v
>retrieving revision 1.19
>diff -u -r1.19 URLMetadataRepository.java
>--- src/org/eclipse/equinox/internal/p2/metadata/repository/URLMetadataRepository.java	6 Oct 2009 21:25:19 -0000	1.19
>+++ src/org/eclipse/equinox/internal/p2/metadata/repository/URLMetadataRepository.java	2 Nov 2009 22:23:58 -0000
>@@ -13,7 +13,7 @@
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
> 
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> import java.net.URI;
> import java.util.*;
>@@ -79,7 +79,7 @@
> 		return false;
> 	}
> 
>-	public synchronized Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public synchronized Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		return query.perform(units.iterator(), collector);
> 	}
> }
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepository.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepository.java,v
>retrieving revision 1.9
>diff -u -r1.9 IMetadataRepository.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepository.java	6 Oct 2009 21:25:20 -0000	1.9
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepository.java	2 Nov 2009 22:23:58 -0000
>@@ -11,7 +11,7 @@
> package org.eclipse.equinox.internal.provisional.p2.metadata.repository;
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQueryable;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> import java.net.URI;
> import org.eclipse.core.runtime.IProgressMonitor;
>@@ -70,7 +70,7 @@
> 	 * @return <code>true</code> if any units were actually removed, and
> 	 * <code>false</code> otherwise
> 	 */
>-	public boolean removeInstallableUnits(Query query, IProgressMonitor monitor);
>+	public boolean removeInstallableUnits(IQuery query, IProgressMonitor monitor);
> 
> 	/**
> 	 * Remove all installable units from this repository. 
>Index: src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/AbstractMetadataRepository.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/AbstractMetadataRepository.java,v
>retrieving revision 1.15
>diff -u -r1.15 AbstractMetadataRepository.java
>--- src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/AbstractMetadataRepository.java	8 Oct 2009 13:32:07 -0000	1.15
>+++ src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/AbstractMetadataRepository.java	2 Nov 2009 22:23:58 -0000
>@@ -12,7 +12,7 @@
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
> 
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> import org.eclipse.equinox.internal.provisional.spi.p2.repository.AbstractRepository;
> 
>@@ -66,7 +66,7 @@
> 		assertModifiable();
> 	}
> 
>-	public boolean removeInstallableUnits(Query query, IProgressMonitor monitor) {
>+	public boolean removeInstallableUnits(IQuery query, IProgressMonitor monitor) {
> 		assertModifiable();
> 		return false;
> 	}
>#P org.eclipse.equinox.p2.publisher
>Index: src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java,v
>retrieving revision 1.35.2.2
>diff -u -r1.35.2.2 AbstractPublisherAction.java
>--- src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java	30 Oct 2009 18:54:08 -0000	1.35.2.2
>+++ src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java	2 Nov 2009 22:23:59 -0000
>@@ -499,13 +499,13 @@
> 	 * @return the first matching IU or <code>null</code> if none.
> 	 */
> 	protected IInstallableUnit queryForIU(IPublisherResult publisherResult, String iuId, Version version) {
>-		Query query = null;
>+		IQuery query = null;
> 		Collector collector = null;
> 		if (version != null && !Version.emptyVersion.equals(version)) {
> 			query = new InstallableUnitQuery(iuId, version);
> 			collector = new SingleElementCollector();
> 		} else {
>-			query = new PipedQuery(new Query[] {new InstallableUnitQuery(iuId), new LatestIUVersionQuery()});
>+			query = new PipedQuery(new IQuery[] {new InstallableUnitQuery(iuId), new LatestIUVersionQuery()});
> 			collector = new Collector();
> 		}
> 
>@@ -530,7 +530,7 @@
> 	 * @return The the IUs with the matching ids in the given range
> 	 */
> 	protected IInstallableUnit[] queryForIUs(IPublisherResult publisherResult, String iuId, VersionRange versionRange) {
>-		Query query = null;
>+		IQuery query = null;
> 		Collector collector = new Collector();
> 		query = new InstallableUnitQuery(iuId, versionRange);
> 		NullProgressMonitor progress = new NullProgressMonitor();
>Index: src/org/eclipse/equinox/p2/publisher/PublisherResult.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherResult.java,v
>retrieving revision 1.8
>diff -u -r1.8 PublisherResult.java
>--- src/org/eclipse/equinox/p2/publisher/PublisherResult.java	14 Oct 2009 21:33:20 -0000	1.8
>+++ src/org/eclipse/equinox/p2/publisher/PublisherResult.java	2 Nov 2009 22:23:59 -0000
>@@ -129,7 +129,7 @@
> 			this.map = map;
> 		}
> 
>-		public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+		public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 			return query.perform(flatten(this.map.values()).iterator(), collector);
> 		}
> 	}
>@@ -137,7 +137,7 @@
> 	/**
> 	 * Queries both the root and non root IUs
> 	 */
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		IQueryable nonRootQueryable = new QueryableMap(nonRootIUs);
> 		IQueryable rootQueryable = new QueryableMap(rootIUs);
> 		return new CompoundQueryable(new IQueryable[] {nonRootQueryable, rootQueryable}).query(query, collector, monitor);
>Index: src/org/eclipse/equinox/p2/publisher/actions/RootIUResultFilterAdvice.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/RootIUResultFilterAdvice.java,v
>retrieving revision 1.3
>diff -u -r1.3 RootIUResultFilterAdvice.java
>--- src/org/eclipse/equinox/p2/publisher/actions/RootIUResultFilterAdvice.java	6 Oct 2009 21:25:22 -0000	1.3
>+++ src/org/eclipse/equinox/p2/publisher/actions/RootIUResultFilterAdvice.java	2 Nov 2009 22:23:59 -0000
>@@ -11,14 +11,14 @@
> 
> import java.util.Collection;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> import org.eclipse.equinox.p2.publisher.AbstractAdvice;
> import org.eclipse.equinox.p2.publisher.IPublisherResult;
> 
> public class RootIUResultFilterAdvice extends AbstractAdvice implements IRootIUAdvice {
>-	private Query query;
>+	private IQuery query;
> 
>-	public RootIUResultFilterAdvice(Query query) {
>+	public RootIUResultFilterAdvice(IQuery query) {
> 		this.query = query;
> 	}
> 
>#P org.eclipse.equinox.p2.repository.tools
>Index: src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java,v
>retrieving revision 1.7
>diff -u -r1.7 AbstractRepositoryTask.java
>--- src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java	6 Oct 2009 21:25:31 -0000	1.7
>+++ src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/AbstractRepositoryTask.java	2 Nov 2009 22:24:00 -0000
>@@ -12,7 +12,7 @@
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
> 
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> import java.io.File;
> import java.net.URI;
>@@ -168,7 +168,7 @@
> 		List result = new ArrayList();
> 		for (Iterator iter = iuTasks.iterator(); iter.hasNext();) {
> 			IUDescription iu = (IUDescription) iter.next();
>-			Query iuQuery = iu.createQuery();
>+			IQuery iuQuery = iu.createQuery();
> 			Collector collector = new Collector();
> 
> 			repository.query(iuQuery, collector, null);
>Index: src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/IUDescription.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/IUDescription.java,v
>retrieving revision 1.7.2.1
>diff -u -r1.7.2.1 IUDescription.java
>--- src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/IUDescription.java	29 Oct 2009 22:53:06 -0000	1.7.2.1
>+++ src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/IUDescription.java	2 Nov 2009 22:24:00 -0000
>@@ -100,7 +100,7 @@
> 		return buffer.toString();
> 	}
> 
>-	public Query createQuery() {
>+	public IQuery createQuery() {
> 		List queries = new ArrayList();
> 		if (id != null) {
> 			if (version == null || version.length() == 0) {
>@@ -113,16 +113,16 @@
> 			}
> 		}
> 
>-		Query iuQuery = processQueryString();
>+		IQuery iuQuery = processQueryString();
> 		if (iuQuery != null)
> 			queries.add(iuQuery);
> 
> 		if (queries.size() == 1)
>-			return (Query) queries.get(0);
>-		return new PipedQuery((Query[]) queries.toArray(new Query[queries.size()]));
>+			return (IQuery) queries.get(0);
>+		return new PipedQuery((IQuery[]) queries.toArray(new IQuery[queries.size()]));
> 	}
> 
>-	private Query processQueryString() {
>+	private IQuery processQueryString() {
> 		if (queryString == null)
> 			return null;
> 		int startIdx = queryString.indexOf('[');
>Index: src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RemoveIUTask.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RemoveIUTask.java,v
>retrieving revision 1.4
>diff -u -r1.4 RemoveIUTask.java
>--- src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RemoveIUTask.java	9 Oct 2009 20:49:13 -0000	1.4
>+++ src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/RemoveIUTask.java	2 Nov 2009 22:24:00 -0000
>@@ -62,7 +62,7 @@
> 			final Set toRemove = new HashSet();
> 			for (Iterator iter = iuTasks.iterator(); iter.hasNext();) {
> 				IUDescription iu = (IUDescription) iter.next();
>-				Query iuQuery = iu.createQuery();
>+				IQuery iuQuery = iu.createQuery();
> 
> 				Collector collector = new Collector();
> 				repository.query(iuQuery, collector, null);
>@@ -104,7 +104,7 @@
> 			}
> 
> 			if (toRemove.size() > 0) {
>-				Query removeQuery = new MatchQuery() {
>+				IQuery removeQuery = new MatchQuery() {
> 					public boolean isMatch(Object candidate) {
> 						return toRemove.contains(candidate);
> 					}
>#P org.eclipse.equinox.p2.tests
>Index: src/org/eclipse/equinox/p2/tests/IUPropertyUtils.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/IUPropertyUtils.java,v
>retrieving revision 1.2.2.2
>diff -u -r1.2.2.2 IUPropertyUtils.java
>--- src/org/eclipse/equinox/p2/tests/IUPropertyUtils.java	2 Nov 2009 21:58:29 -0000	1.2.2.2
>+++ src/org/eclipse/equinox/p2/tests/IUPropertyUtils.java	2 Nov 2009 22:24:01 -0000
>@@ -127,8 +127,8 @@
> 			}
> 		};
> 
>-		Query iuQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_FRAGMENT, "true"); //$NON-NLS-1$
>-		iuQuery = new PipedQuery(new Query[] {iuQuery, hostLocalizationQuery});
>+		IQuery iuQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_FRAGMENT, "true"); //$NON-NLS-1$
>+		iuQuery = new PipedQuery(new IQuery[] {iuQuery, hostLocalizationQuery});
> 		Collector collected = iuQuery.perform(localizationFragments.iterator(), new Collector());
> 
> 		if (!collected.isEmpty()) {
>@@ -205,8 +205,8 @@
> 			}
> 		};
> 
>-		Query iuQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_FRAGMENT, "true"); //$NON-NLS-1$
>-		iuQuery = new PipedQuery(new Query[] {iuQuery, localeFragmentQuery});
>+		IQuery iuQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_FRAGMENT, "true"); //$NON-NLS-1$
>+		iuQuery = new PipedQuery(new IQuery[] {iuQuery, localeFragmentQuery});
> 		Collector collected = queryable.query(iuQuery, new Collector(), null);
> 		LocaleCollectorCache.put(locale, new SoftReference(collected));
> 		return collected;
>Index: src/org/eclipse/equinox/p2/tests/MockQueryable.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/MockQueryable.java,v
>retrieving revision 1.2
>diff -u -r1.2 MockQueryable.java
>--- src/org/eclipse/equinox/p2/tests/MockQueryable.java	6 Oct 2009 21:24:47 -0000	1.2
>+++ src/org/eclipse/equinox/p2/tests/MockQueryable.java	2 Nov 2009 22:24:01 -0000
>@@ -35,7 +35,7 @@
> 
> 	}
> 
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		return query.perform(items.iterator(), collector);
> 	}
> 
>Index: src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java,v
>retrieving revision 1.21.2.1
>diff -u -r1.21.2.1 TestMetadataRepository.java
>--- src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java	22 Oct 2009 01:03:19 -0000	1.21.2.1
>+++ src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java	2 Nov 2009 22:24:01 -0000
>@@ -68,7 +68,7 @@
> 		return null;
> 	}
> 
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		return query.perform(units.iterator(), collector);
> 	}
> 
>Index: src/org/eclipse/equinox/p2/tests/core/AggregateQueryTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/AggregateQueryTest.java,v
>retrieving revision 1.3.2.1
>diff -u -r1.3.2.1 AggregateQueryTest.java
>--- src/org/eclipse/equinox/p2/tests/core/AggregateQueryTest.java	29 Oct 2009 22:53:13 -0000	1.3.2.1
>+++ src/org/eclipse/equinox/p2/tests/core/AggregateQueryTest.java	2 Nov 2009 22:24:01 -0000
>@@ -28,14 +28,14 @@
> 	}
> 
> 	public void testEmptyCompositeQuery() {
>-		PipedQuery query = new PipedQuery(new Query[0]);
>+		PipedQuery query = new PipedQuery(new IQuery[0]);
> 		query.perform(getABCDE().iterator(), new Collector());
> 		// We should not throw an exception. No guarantee on what perform
> 		// will return in this case
> 	}
> 
> 	public void testSymmetry() {
>-		Query getLatest = new ContextQuery() {
>+		IQuery getLatest = new ContextQuery() {
> 
> 			public Collector perform(Iterator iterator, Collector result) {
> 				List list = new ArrayList();
>@@ -48,7 +48,7 @@
> 			}
> 		};
> 
>-		Query getAllBut3 = new ContextQuery() {
>+		IQuery getAllBut3 = new ContextQuery() {
> 
> 			public Collector perform(Iterator iterator, Collector result) {
> 				while (iterator.hasNext()) {
>@@ -60,19 +60,19 @@
> 			}
> 		};
> 
>-		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new Query[] {getLatest, getAllBut3}, true);
>+		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new IQuery[] {getLatest, getAllBut3}, true);
> 		Collector result = compoundQuery.perform(get123().iterator(), new Collector());
> 		assertEquals(0, result.size());
> 
>-		compoundQuery = CompoundQuery.createCompoundQuery(new Query[] {getAllBut3, getLatest}, true);
>+		compoundQuery = CompoundQuery.createCompoundQuery(new IQuery[] {getAllBut3, getLatest}, true);
> 		result = compoundQuery.perform(get123().iterator(), new Collector());
> 		assertEquals(0, result.size());
> 
>-		compoundQuery = CompoundQuery.createCompoundQuery(new Query[] {getLatest, getAllBut3}, false);
>+		compoundQuery = CompoundQuery.createCompoundQuery(new IQuery[] {getLatest, getAllBut3}, false);
> 		result = compoundQuery.perform(get123().iterator(), new Collector());
> 		assertEquals(3, result.size());
> 
>-		compoundQuery = CompoundQuery.createCompoundQuery(new Query[] {getAllBut3, getLatest}, false);
>+		compoundQuery = CompoundQuery.createCompoundQuery(new IQuery[] {getAllBut3, getLatest}, false);
> 		result = compoundQuery.perform(get123().iterator(), new Collector());
> 		assertEquals(3, result.size());
> 
>@@ -83,7 +83,7 @@
> 	 * This method tests that
> 	 */
> 	public void testNonSymmetry() {
>-		Query getLatest = new ContextQuery() {
>+		IQuery getLatest = new ContextQuery() {
> 
> 			public Collector perform(Iterator iterator, Collector result) {
> 				List list = new ArrayList();
>@@ -96,7 +96,7 @@
> 			}
> 		};
> 
>-		Query getAllBut3 = new ContextQuery() {
>+		IQuery getAllBut3 = new ContextQuery() {
> 
> 			public Collector perform(Iterator iterator, Collector result) {
> 				while (iterator.hasNext()) {
>@@ -108,11 +108,11 @@
> 			}
> 		};
> 
>-		PipedQuery compoundQuery = new PipedQuery(new Query[] {getLatest, getAllBut3});
>+		PipedQuery compoundQuery = new PipedQuery(new IQuery[] {getLatest, getAllBut3});
> 		Collector result = compoundQuery.perform(get123().iterator(), new Collector());
> 		assertEquals(0, result.size());
> 
>-		compoundQuery = new PipedQuery(new Query[] {getAllBut3, getLatest});
>+		compoundQuery = new PipedQuery(new IQuery[] {getAllBut3, getLatest});
> 		result = compoundQuery.perform(get123().iterator(), new Collector());
> 		assertEquals(1, result.size());
> 		assertEquals("2", result.toCollection().iterator().next());
>@@ -120,22 +120,22 @@
> 	}
> 
> 	public void testCompoundAllMatchQueries() {
>-		Query A = new MatchQuery() {
>+		IQuery A = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				return false;
> 			}
> 		};
>-		Query B = new MatchQuery() {
>+		IQuery B = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				return false;
> 			}
> 		};
>-		Query C = new MatchQuery() {
>+		IQuery C = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				return false;
> 			}
> 		};
>-		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new Query[] {A, B, C}, true);
>+		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new IQuery[] {A, B, C}, true);
> 		assertTrue("1.0", compoundQuery instanceof IMatchQuery);
> 		assertEquals("1.1", 3, compoundQuery.getQueries().length);
> 		assertEquals("1.2", A, compoundQuery.getQueries()[0]);
>@@ -144,23 +144,23 @@
> 	}
> 
> 	public void testCompoundSomeMatchQueries() {
>-		Query A = new MatchQuery() {
>+		IQuery A = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				return false;
> 			}
> 		};
>-		Query B = new ContextQuery() {
>+		IQuery B = new ContextQuery() {
> 			public Collector perform(Iterator iterator, Collector result) {
> 				// TODO Auto-generated method stub
> 				return null;
> 			}
> 		};
>-		Query C = new MatchQuery() {
>+		IQuery C = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				return false;
> 			}
> 		};
>-		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new Query[] {A, B, C}, true);
>+		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new IQuery[] {A, B, C}, true);
> 		assertTrue("1.0", !(compoundQuery instanceof IMatchQuery));
> 		assertEquals("1.1", 3, compoundQuery.getQueries().length);
> 		assertEquals("1.2", A, compoundQuery.getQueries()[0]);
>@@ -169,25 +169,25 @@
> 	}
> 
> 	public void testCompoundNoMatchQueries() {
>-		Query A = new ContextQuery() {
>+		IQuery A = new ContextQuery() {
> 			public Collector perform(Iterator iterator, Collector result) {
> 				// TODO Auto-generated method stub
> 				return null;
> 			}
> 		};
>-		Query B = new ContextQuery() {
>+		IQuery B = new ContextQuery() {
> 			public Collector perform(Iterator iterator, Collector result) {
> 				// TODO Auto-generated method stub
> 				return null;
> 			}
> 		};
>-		Query C = new ContextQuery() {
>+		IQuery C = new ContextQuery() {
> 			public Collector perform(Iterator iterator, Collector result) {
> 				// TODO Auto-generated method stub
> 				return null;
> 			}
> 		};
>-		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new Query[] {A, B, C}, true);
>+		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new IQuery[] {A, B, C}, true);
> 		assertTrue("1.0", !(compoundQuery instanceof IMatchQuery));
> 		assertEquals("1.1", 3, compoundQuery.getQueries().length);
> 		assertEquals("1.2", A, compoundQuery.getQueries()[0]);
>@@ -196,7 +196,7 @@
> 	}
> 
> 	public void testIntersection() {
>-		Query ABC = new MatchQuery() {
>+		IQuery ABC = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (candidate.equals("A") || candidate.equals("B") || candidate.equals("C"))
> 					return true;
>@@ -204,7 +204,7 @@
> 			}
> 		};
> 
>-		Query BCDE = new MatchQuery() {
>+		IQuery BCDE = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (candidate.equals("B") || candidate.equals("C") || candidate.equals("D") || candidate.equals("E"))
> 					return true;
>@@ -212,7 +212,7 @@
> 			}
> 		};
> 
>-		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new Query[] {ABC, BCDE}, true);
>+		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new IQuery[] {ABC, BCDE}, true);
> 		Collector result = compoundQuery.perform(getABCDE().iterator(), new Collector());
> 		assertEquals("1.0", result.size(), 2);
> 		assertTrue("1.1", result.toCollection().contains("B"));
>@@ -220,7 +220,7 @@
> 	}
> 
> 	public void testIntersection2() {
>-		Query ABC = new ContextQuery() {
>+		IQuery ABC = new ContextQuery() {
> 			public Collector perform(Iterator iterator, Collector result) {
> 				while (iterator.hasNext()) {
> 					Object o = iterator.next();
>@@ -231,7 +231,7 @@
> 			}
> 		};
> 
>-		Query BCDE = new ContextQuery() {
>+		IQuery BCDE = new ContextQuery() {
> 			public Collector perform(Iterator iterator, Collector result) {
> 				while (iterator.hasNext()) {
> 					Object o = iterator.next();
>@@ -242,7 +242,7 @@
> 			}
> 		};
> 
>-		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new Query[] {ABC, BCDE}, true);
>+		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new IQuery[] {ABC, BCDE}, true);
> 		Collector result = compoundQuery.perform(getABCDE().iterator(), new Collector());
> 		assertEquals("1.0", result.size(), 2);
> 		assertTrue("1.1", result.toCollection().contains("B"));
>@@ -250,7 +250,7 @@
> 	}
> 
> 	public void testUnion() {
>-		Query ABC = new MatchQuery() {
>+		IQuery ABC = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (candidate.equals("A") || candidate.equals("B") || candidate.equals("C"))
> 					return true;
>@@ -258,7 +258,7 @@
> 			}
> 		};
> 
>-		Query BCDE = new MatchQuery() {
>+		IQuery BCDE = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (candidate.equals("B") || candidate.equals("C") || candidate.equals("D") || candidate.equals("E"))
> 					return true;
>@@ -266,7 +266,7 @@
> 			}
> 		};
> 
>-		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new Query[] {ABC, BCDE}, false);
>+		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new IQuery[] {ABC, BCDE}, false);
> 		Collector result = compoundQuery.perform(getABCDE().iterator(), new Collector());
> 		assertEquals("1.0", result.size(), 5);
> 		assertTrue("1.1", result.toCollection().contains("A"));
>@@ -277,7 +277,7 @@
> 	}
> 
> 	public void testUnion2() {
>-		Query ABC = new ContextQuery() {
>+		IQuery ABC = new ContextQuery() {
> 			public Collector perform(Iterator iterator, Collector result) {
> 				while (iterator.hasNext()) {
> 					Object o = iterator.next();
>@@ -288,7 +288,7 @@
> 			}
> 		};
> 
>-		Query BCDE = new ContextQuery() {
>+		IQuery BCDE = new ContextQuery() {
> 			public Collector perform(Iterator iterator, Collector result) {
> 				while (iterator.hasNext()) {
> 					Object o = iterator.next();
>@@ -299,7 +299,7 @@
> 			}
> 		};
> 
>-		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new Query[] {ABC, BCDE}, false);
>+		CompoundQuery compoundQuery = CompoundQuery.createCompoundQuery(new IQuery[] {ABC, BCDE}, false);
> 		Collector result = compoundQuery.perform(getABCDE().iterator(), new Collector());
> 		assertEquals("1.0", result.size(), 5);
> 		assertTrue("1.1", result.toCollection().contains("A"));
>Index: src/org/eclipse/equinox/p2/tests/core/CollectorTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/CollectorTest.java,v
>retrieving revision 1.5
>diff -u -r1.5 CollectorTest.java
>--- src/org/eclipse/equinox/p2/tests/core/CollectorTest.java	6 Oct 2009 21:24:46 -0000	1.5
>+++ src/org/eclipse/equinox/p2/tests/core/CollectorTest.java	2 Nov 2009 22:24:01 -0000
>@@ -47,7 +47,7 @@
> 	public void testCompositeCollectors() {
> 		String[] s = new String[] {"A", "B", "C", "D", "E", "F", "G", "1", "2", "3", "4", "5", "6", "7"};
> 		List list = Arrays.asList(s);
>-		Query numeric = new MatchQuery() {
>+		IQuery numeric = new MatchQuery() {
> 
> 			public boolean isMatch(Object candidate) {
> 				if (((String) candidate).compareTo("0") > 0 && ((String) candidate).compareTo("8") < 0) {
>@@ -57,7 +57,7 @@
> 			}
> 		};
> 
>-		Query fourOrFiveOrABC = new MatchQuery() {
>+		IQuery fourOrFiveOrABC = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (((String) candidate).equals("4") || ((String) candidate).equals("5") || ((String) candidate).equals("A") || ((String) candidate).equals("B") || ((String) candidate).equals("C")) {
> 					return true;
>@@ -78,7 +78,7 @@
> 	public void testSameCollector() {
> 		String[] s = new String[] {"A", "B", "C", "D", "E", "F", "G", "1", "2", "3", "4", "5", "6", "7"};
> 		List list = Arrays.asList(s);
>-		Query numeric = new MatchQuery() {
>+		IQuery numeric = new MatchQuery() {
> 
> 			public boolean isMatch(Object candidate) {
> 				if (((String) candidate).compareTo("0") > 0 && ((String) candidate).compareTo("8") < 0) {
>@@ -88,7 +88,7 @@
> 			}
> 		};
> 
>-		Query fourOrFiveOrABC = new MatchQuery() {
>+		IQuery fourOrFiveOrABC = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (((String) candidate).equals("4") || ((String) candidate).equals("5") || ((String) candidate).equals("A") || ((String) candidate).equals("B") || ((String) candidate).equals("C")) {
> 					return true;
>@@ -110,7 +110,7 @@
> 	public void testEmptyCompositeCollectors() {
> 		String[] s = new String[] {"A", "B", "C", "D", "E", "F", "G", "1", "2", "3", "4", "5", "6", "7"};
> 		List list = Arrays.asList(s);
>-		Query eightOrNine = new MatchQuery() {
>+		IQuery eightOrNine = new MatchQuery() {
> 
> 			public boolean isMatch(Object candidate) {
> 				if (((String) candidate).compareTo("8") > 0 && ((String) candidate).compareTo("9") < 0) {
>@@ -120,7 +120,7 @@
> 			}
> 		};
> 
>-		Query fourOrFiveOrABC = new MatchQuery() {
>+		IQuery fourOrFiveOrABC = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (((String) candidate).equals("4") || ((String) candidate).equals("5") || ((String) candidate).equals("A") || ((String) candidate).equals("B") || ((String) candidate).equals("C")) {
> 					return true;
>Index: src/org/eclipse/equinox/p2/tests/core/CompoundQueryableTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/CompoundQueryableTest.java,v
>retrieving revision 1.4.2.1
>diff -u -r1.4.2.1 CompoundQueryableTest.java
>--- src/org/eclipse/equinox/p2/tests/core/CompoundQueryableTest.java	29 Oct 2009 22:53:13 -0000	1.4.2.1
>+++ src/org/eclipse/equinox/p2/tests/core/CompoundQueryableTest.java	2 Nov 2009 22:24:01 -0000
>@@ -56,7 +56,7 @@
> 	IQueryable queryable1 = new IQueryable() {
> 		Integer[] elements = new Integer[] {1, 2, 3, 4, 5};
> 
>-		public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+		public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 			try {
> 				monitor.beginTask("", 10);
> 				collector = query.perform(createIterator(elements), collector);
>@@ -71,7 +71,7 @@
> 	IQueryable queryable2 = new IQueryable() {
> 		Integer[] elements = new Integer[] {4, 6, 8, 10, 12};
> 
>-		public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+		public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 			try {
> 				monitor.beginTask("", 10);
> 				collector = query.perform(createIterator(elements), collector);
>@@ -86,7 +86,7 @@
> 	IQueryable queryable3 = new IQueryable() {
> 		Integer[] elements = new Integer[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13};
> 
>-		public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+		public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 			try {
> 				monitor.beginTask("", 10);
> 				collector = query.perform(createIterator(elements), collector);
>@@ -98,7 +98,7 @@
> 		}
> 	};
> 
>-	Query matchQuery = new MatchQuery() {
>+	IQuery matchQuery = new MatchQuery() {
> 
> 		public boolean isMatch(Object candidate) {
> 			if (candidate instanceof Integer) {
>@@ -110,7 +110,7 @@
> 		}
> 	};
> 
>-	Query matchMod4query = new MatchQuery() {
>+	IQuery matchMod4query = new MatchQuery() {
> 		public boolean isMatch(Object candidate) {
> 			if (candidate instanceof Integer) {
> 				int x = ((Integer) candidate).intValue();
>@@ -121,7 +121,7 @@
> 		}
> 	};
> 
>-	Query contextQuery = new ContextQuery() {
>+	IQuery contextQuery = new ContextQuery() {
> 
> 		public Collector perform(Iterator iterator, Collector result) {
> 			while (iterator.hasNext()) {
>@@ -135,7 +135,7 @@
> 
> 	};
> 
>-	Query greatestNumberQuery = new ContextQuery() {
>+	IQuery greatestNumberQuery = new ContextQuery() {
> 		public Collector perform(Iterator iterator, Collector result) {
> 			int greatest = Integer.MIN_VALUE;
> 			while (iterator.hasNext()) {
>@@ -266,7 +266,7 @@
> 	public void testCompoundMatchAndQuery() {
> 		CompoundQueryable cQueryable = new CompoundQueryable(new IQueryable[] {queryable1, queryable2});
> 		CompoundQueryTestProgressMonitor monitor = new CompoundQueryTestProgressMonitor();
>-		Collector collector = cQueryable.query(CompoundQuery.createCompoundQuery(new Query[] {matchQuery, matchMod4query}, true), new Collector(), monitor);
>+		Collector collector = cQueryable.query(CompoundQuery.createCompoundQuery(new IQuery[] {matchQuery, matchMod4query}, true), new Collector(), monitor);
> 		assertEquals("1.0", 3, collector.size());
> 		Collection collection = collector.toCollection();
> 		assertTrue("1.2", collection.contains(4));
>@@ -277,7 +277,7 @@
> 	public void testCompoundMatchOrQuery() {
> 		CompoundQueryable cQueryable = new CompoundQueryable(new IQueryable[] {queryable1, queryable2});
> 		CompoundQueryTestProgressMonitor monitor = new CompoundQueryTestProgressMonitor();
>-		Collector collector = cQueryable.query(CompoundQuery.createCompoundQuery(new Query[] {matchQuery, matchMod4query}, false), new Collector(), monitor);
>+		Collector collector = cQueryable.query(CompoundQuery.createCompoundQuery(new IQuery[] {matchQuery, matchMod4query}, false), new Collector(), monitor);
> 		assertEquals("1.0", 6, collector.size());
> 		Collection collection = collector.toCollection();
> 		assertTrue("1.2", collection.contains(2));
>@@ -331,7 +331,7 @@
> 		CompoundQueryable cQueryable1 = new CompoundQueryable(new IQueryable[] {queryable3, queryable2});
> 		CompoundQueryable cQueryable = new CompoundQueryable(new IQueryable[] {cQueryable1, queryable1});
> 		CompoundQueryTestProgressMonitor monitor = new CompoundQueryTestProgressMonitor();
>-		Collector collector = cQueryable.query(CompoundQuery.createCompoundQuery(new Query[] {contextQuery, greatestNumberQuery}, false), new Collector(), monitor);
>+		Collector collector = cQueryable.query(CompoundQuery.createCompoundQuery(new IQuery[] {contextQuery, greatestNumberQuery}, false), new Collector(), monitor);
> 		assertEquals("1.0", 7, collector.size());
> 		Collection collection = collector.toCollection();
> 		assertTrue("1.2", collection.contains(2));
>@@ -349,7 +349,7 @@
> 		CompoundQueryable cQueryable1 = new CompoundQueryable(new IQueryable[] {queryable3, queryable2});
> 		CompoundQueryable cQueryable = new CompoundQueryable(new IQueryable[] {cQueryable1, queryable1});
> 		CompoundQueryTestProgressMonitor monitor = new CompoundQueryTestProgressMonitor();
>-		Collector collector = cQueryable.query(new PipedQuery(new Query[] {contextQuery, greatestNumberQuery}), new Collector(), monitor);
>+		Collector collector = cQueryable.query(new PipedQuery(new IQuery[] {contextQuery, greatestNumberQuery}), new Collector(), monitor);
> 		assertEquals("1.0", 1, collector.size());
> 		Collection collection = collector.toCollection();
> 		assertTrue("1.2", collection.contains(12));
>Index: src/org/eclipse/equinox/p2/tests/core/QueryTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/QueryTest.java,v
>retrieving revision 1.7.2.1
>diff -u -r1.7.2.1 QueryTest.java
>--- src/org/eclipse/equinox/p2/tests/core/QueryTest.java	29 Oct 2009 22:53:13 -0000	1.7.2.1
>+++ src/org/eclipse/equinox/p2/tests/core/QueryTest.java	2 Nov 2009 22:24:01 -0000
>@@ -78,7 +78,7 @@
> 	 */
> 	public void testPerformSimple() {
> 		List items = Arrays.asList("red", "green", "blue");
>-		Query query = new AnyStringQuery();
>+		IQuery query = new AnyStringQuery();
> 		Collector collector = new Collector();
> 		query.perform(items.iterator(), collector);
> 		Collection result = collector.toCollection();
>@@ -93,7 +93,7 @@
> 	 */
> 	public void testPerformSomeMatches() {
> 		List items = Arrays.asList(new Object(), "green", new Object());
>-		Query query = new AnyStringQuery();
>+		IQuery query = new AnyStringQuery();
> 		Collector collector = new Collector();
> 		query.perform(items.iterator(), collector);
> 		Collection result = collector.toCollection();
>@@ -114,32 +114,32 @@
> 	}
> 
> 	public void testPropertyLookupMatchQuery() {
>-		Query query1 = new PropertyLookupQuery1();
>+		IQuery query1 = new PropertyLookupQuery1();
> 		Object property = query1.getProperty("SomeProperty");
> 		assertEquals("1.0", "foo", property);
> 	}
> 
> 	public void testPropertyLookupContextQuery() {
>-		Query query1 = new PropertyLookupQuery2();
>+		IQuery query1 = new PropertyLookupQuery2();
> 		Object property = query1.getProperty("SomeOtherProperty");
> 		assertEquals("1.0", "bar", property);
> 	}
> 
> 	public void testPropertyLookupInvalidProperty1() {
>-		Query query1 = new PropertyLookupQuery1();
>+		IQuery query1 = new PropertyLookupQuery1();
> 		Object property = query1.getProperty("ThisProperty");
> 		assertEquals("1.0", null, property);
> 	}
> 
> 	public void testPropertyLookupInvalidProperty2() {
>-		Query query1 = new PropertyLookupQuery1();
>+		IQuery query1 = new PropertyLookupQuery1();
> 		Object property = query1.getProperty("SomeOtherProperty");
> 		assertEquals("1.0", null, property);
> 	}
> 
> 	public void testIDLookup() {
>-		Query query1 = new PropertyLookupQuery1();
>-		Query query2 = new PropertyLookupQuery2();
>+		IQuery query1 = new PropertyLookupQuery1();
>+		IQuery query2 = new PropertyLookupQuery2();
> 		assertEquals("1.0", "org.eclipse.equinox.p2.tests.core.PropertyLookupQuery1", query1.getId());
> 		assertEquals("1.0", "org.eclipse.equinox.p2.tests.core.PropertyLookupQuery2", query2.getId());
> 	}
>@@ -165,7 +165,7 @@
> 		Collector collector = new Collector();
> 		PerformHookQuery query1 = new PerformHookQuery();
> 		PerformHookQuery query2 = new PerformHookQuery();
>-		CompoundQuery cQuery = CompoundQuery.createCompoundQuery(new Query[] {query1, query2}, true);
>+		CompoundQuery cQuery = CompoundQuery.createCompoundQuery(new IQuery[] {query1, query2}, true);
> 		assertFalse("1.0", query1.isComplete());
> 		assertFalse("1.1", query1.isPrepared());
> 		assertFalse("1.2", query2.isComplete());
>@@ -184,7 +184,7 @@
> 		Collector collector = new Collector();
> 		PerformHookQuery query1 = new PerformHookQuery();
> 		PerformHookQuery query2 = new PerformHookQuery();
>-		CompoundQuery cQuery = CompoundQuery.createCompoundQuery(new Query[] {query1, query2}, false);
>+		CompoundQuery cQuery = CompoundQuery.createCompoundQuery(new IQuery[] {query1, query2}, false);
> 		assertFalse("1.0", query1.isComplete());
> 		assertFalse("1.1", query1.isPrepared());
> 		assertFalse("1.2", query2.isComplete());
>@@ -203,7 +203,7 @@
> 		Collector collector = new Collector();
> 		PerformHookQuery query1 = new PerformHookQuery();
> 		PerformHookQuery query2 = new PerformHookQuery();
>-		PipedQuery cQuery = new PipedQuery(new Query[] {query1, query2});
>+		PipedQuery cQuery = new PipedQuery(new IQuery[] {query1, query2});
> 		assertFalse("1.0", query1.isComplete());
> 		assertFalse("1.1", query1.isPrepared());
> 		assertFalse("1.2", query2.isComplete());
>@@ -222,7 +222,7 @@
> 		Collector collector = new Collector();
> 		PerformHookQuery query1 = new PerformHookQuery();
> 		PerformHookQuery query2 = new PerformHookQuery();
>-		CompoundQuery cQuery = CompoundQuery.createCompoundQuery(new Query[] {query1, query2}, true);
>+		CompoundQuery cQuery = CompoundQuery.createCompoundQuery(new IQuery[] {query1, query2}, true);
> 		assertFalse("1.0", query1.isComplete());
> 		assertFalse("1.1", query1.isPrepared());
> 		assertFalse("1.2", query2.isComplete());
>@@ -246,7 +246,7 @@
> 		Collector collector = new Collector();
> 		PerformHookQuery query1 = new PerformHookQuery();
> 		PerformHookQuery query2 = new PerformHookQuery();
>-		PipedQuery cQuery = new PipedQuery(new Query[] {query1, query2});
>+		PipedQuery cQuery = new PipedQuery(new IQuery[] {query1, query2});
> 		assertFalse("1.0", query1.isComplete());
> 		assertFalse("1.1", query1.isPrepared());
> 		assertFalse("1.2", query2.isComplete());
>@@ -270,7 +270,7 @@
> 	 */
> 	public void testShortCircuit() {
> 		List items = Arrays.asList("red", "green", "blue");
>-		Query query = new AnyStringQuery();
>+		IQuery query = new AnyStringQuery();
> 		Collector collector = new ShortCircuitCollector();
> 		query.perform(items.iterator(), collector);
> 		Collection result = collector.toCollection();
>Index: src/org/eclipse/equinox/p2/tests/director/DirectorAppTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/DirectorAppTest.java,v
>retrieving revision 1.9
>diff -u -r1.9 DirectorAppTest.java
>--- src/org/eclipse/equinox/p2/tests/director/DirectorAppTest.java	6 Oct 2009 21:24:46 -0000	1.9
>+++ src/org/eclipse/equinox/p2/tests/director/DirectorAppTest.java	2 Nov 2009 22:24:02 -0000
>@@ -473,10 +473,10 @@
> 		URI metadataRepo1 = getTestData("10.1", "/testData/metadataRepo/good").toURI();
> 		URI metadataRepo2 = getTestData("10.1", "/testData/metadataRepo/multipleversions1").toURI();
> 		Application application = new Application();
>-		Method method = application.getClass().getDeclaredMethod("collectRootIUs", URI[].class, Query.class, Collector.class);
>+		Method method = application.getClass().getDeclaredMethod("collectRootIUs", URI[].class, IQuery.class, Collector.class);
> 		method.setAccessible(true);
> 		URI[] uris = new URI[] {metadataRepo1, metadataRepo2};
>-		Query query = new MatchQuery() {
>+		IQuery query = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (candidate instanceof IInstallableUnit) {
> 					IInstallableUnit iu = (IInstallableUnit) candidate;
>Index: src/org/eclipse/equinox/p2/tests/director/DirectorApplicationTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/DirectorApplicationTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 DirectorApplicationTest.java
>--- src/org/eclipse/equinox/p2/tests/director/DirectorApplicationTest.java	20 Oct 2009 17:49:33 -0000	1.4
>+++ src/org/eclipse/equinox/p2/tests/director/DirectorApplicationTest.java	2 Nov 2009 22:24:02 -0000
>@@ -526,10 +526,10 @@
> 		URI metadataRepo1 = getTestData("10.1", "/testData/metadataRepo/good").toURI();
> 		URI metadataRepo2 = getTestData("10.1", "/testData/metadataRepo/multipleversions1").toURI();
> 		Application application = new Application();
>-		Method method = application.getClass().getDeclaredMethod("collectRootIUs", URI[].class, Query.class, Collector.class);
>+		Method method = application.getClass().getDeclaredMethod("collectRootIUs", URI[].class, IQuery.class, Collector.class);
> 		method.setAccessible(true);
> 		URI[] uris = new URI[] {metadataRepo1, metadataRepo2};
>-		Query query = new MatchQuery() {
>+		IQuery query = new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (candidate instanceof IInstallableUnit) {
> 					IInstallableUnit iu = (IInstallableUnit) candidate;
>Index: src/org/eclipse/equinox/p2/tests/engine/EngineTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java,v
>retrieving revision 1.43.2.1
>diff -u -r1.43.2.1 EngineTest.java
>--- src/org/eclipse/equinox/p2/tests/engine/EngineTest.java	22 Oct 2009 01:03:19 -0000	1.43.2.1
>+++ src/org/eclipse/equinox/p2/tests/engine/EngineTest.java	2 Nov 2009 22:24:02 -0000
>@@ -682,7 +682,7 @@
> 	public void testIncompatibleProfile() {
> 
> 		IProfile profile = new IProfile() {
>-			public Collector available(Query query, Collector collector, IProgressMonitor monitor) {
>+			public Collector available(IQuery query, Collector collector, IProgressMonitor monitor) {
> 				return null;
> 			}
> 
>@@ -734,7 +734,7 @@
> 				return false;
> 			}
> 
>-			public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+			public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 				return null;
> 			}
> 		};
>Index: src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java,v
>retrieving revision 1.25.2.1
>diff -u -r1.25.2.1 ProfileTest.java
>--- src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java	22 Oct 2009 01:03:19 -0000	1.25.2.1
>+++ src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java	2 Nov 2009 22:24:02 -0000
>@@ -139,7 +139,7 @@
> 				return false;
> 			}
> 
>-			public Collector queryProfile(IProfile profile, Query query, Collector collector, IProgressMonitor monitor) {
>+			public Collector queryProfile(IProfile profile, IQuery query, Collector collector, IProgressMonitor monitor) {
> 				return collector;
> 			}
> 
>Index: src/org/eclipse/equinox/p2/tests/full/RepoValidator.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/RepoValidator.java,v
>retrieving revision 1.7
>diff -u -r1.7 RepoValidator.java
>--- src/org/eclipse/equinox/p2/tests/full/RepoValidator.java	6 Oct 2009 21:24:47 -0000	1.7
>+++ src/org/eclipse/equinox/p2/tests/full/RepoValidator.java	2 Nov 2009 22:24:02 -0000
>@@ -53,7 +53,7 @@
> 		properties.put("osgi.arch", "x86");
> 		IProfile p = createProfile("repoValidator", null, properties);
> 
>-		Query q;
>+		IQuery q;
> 
> 		q = new InstallableUnitQuery("org.eclipse.rcp.feature.group");
> 
>Index: src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java,v
>retrieving revision 1.15.2.2
>diff -u -r1.15.2.2 CompositeMetadataRepositoryTest.java
>--- src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java	29 Oct 2009 22:53:13 -0000	1.15.2.2
>+++ src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java	2 Nov 2009 22:24:03 -0000
>@@ -475,7 +475,7 @@
> 		CompositeMetadataRepository compositeRepo = createRepo(false);
> 		compositeRepo.addChild(location1);
> 		compositeRepo.addChild(location2);
>-		PipedQuery cQuery = new PipedQuery(new Query[] {new MatchQuery() {
>+		PipedQuery cQuery = new PipedQuery(new IQuery[] {new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (candidate instanceof IInstallableUnit) {
> 					IInstallableUnit iInstallableUnit = (IInstallableUnit) candidate;
>Index: src/org/eclipse/equinox/p2/tests/planner/SimulatedSharedInstallTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/SimulatedSharedInstallTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 SimulatedSharedInstallTest.java
>--- src/org/eclipse/equinox/p2/tests/planner/SimulatedSharedInstallTest.java	8 Oct 2009 13:32:14 -0000	1.4
>+++ src/org/eclipse/equinox/p2/tests/planner/SimulatedSharedInstallTest.java	2 Nov 2009 22:24:03 -0000
>@@ -60,7 +60,7 @@
> 		assertTrue(profile.query(InstallableUnitQuery.ANY, new Collector(), null).toCollection().contains(c1));
> 
> 		IProfile availableWrapper = new IProfile() {
>-			public Collector available(Query query, Collector collector, IProgressMonitor monitor) {
>+			public Collector available(IQuery query, Collector collector, IProgressMonitor monitor) {
> 				profile.query(query, collector, monitor);
> 
> 				Collection ius = new ArrayList();
>@@ -117,7 +117,7 @@
> 				return profile.isRootProfile();
> 			}
> 
>-			public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+			public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 				return profile.query(query, collector, monitor);
> 			}
> 		};
>Index: src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java,v
>retrieving revision 1.16.2.1
>diff -u -r1.16.2.1 RootIUActionTest.java
>--- src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java	22 Oct 2009 01:03:07 -0000	1.16.2.1
>+++ src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java	2 Nov 2009 22:24:03 -0000
>@@ -22,7 +22,7 @@
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
> import org.eclipse.equinox.p2.publisher.IPublisherResult;
> import org.eclipse.equinox.p2.publisher.actions.*;
>@@ -230,7 +230,7 @@
> 	}
> 
> 	private void setupFilterAdvice(int testSpec) {
>-		Query query = null;
>+		IQuery query = null;
> 		rootIUAdviceCollection = new ArrayList();
> 		if ((testSpec & CONTAINS_A) > 0) {
> 			query = new MatchQuery() {
>Index: src/org/eclipse/equinox/p2/tests/updatesite/LocalUpdatesiteTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/LocalUpdatesiteTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 LocalUpdatesiteTest.java
>--- src/org/eclipse/equinox/p2/tests/updatesite/LocalUpdatesiteTest.java	6 Oct 2009 21:24:46 -0000	1.2
>+++ src/org/eclipse/equinox/p2/tests/updatesite/LocalUpdatesiteTest.java	2 Nov 2009 22:24:03 -0000
>@@ -39,7 +39,7 @@
> 	}
> 
> 	public void testCategoryQualifier() throws IOException, ProvisionException {
>-		Query categoryQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.toString(true));
>+		IQuery categoryQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.toString(true));
> 		File siteSource = TestData.getFile("updatesite", "SiteXMLActionTest");
> 		UpdateSitePublisherApplication application = new UpdateSitePublisherApplication();
> 		try {
>Index: src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java,v
>retrieving revision 1.7
>diff -u -r1.7 SiteXMLActionTest.java
>--- src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java	6 Oct 2009 21:24:46 -0000	1.7
>+++ src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java	2 Nov 2009 22:24:03 -0000
>@@ -49,7 +49,7 @@
> 	}
> 
> 	public void testQualifier() {
>-		Query categoryQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.toString(true));
>+		IQuery categoryQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.toString(true));
> 		Collector results = actionResult.query(categoryQuery, new Collector(), new NullProgressMonitor());
> 		Iterator iter = results.iterator();
> 		while (iter.hasNext()) {
>#P org.eclipse.equinox.p2.tests.ui
>Index: src/org/eclipse/equinox/p2/tests/ui/query/AbstractQueryTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/AbstractQueryTest.java,v
>retrieving revision 1.5
>diff -u -r1.5 AbstractQueryTest.java
>--- src/org/eclipse/equinox/p2/tests/ui/query/AbstractQueryTest.java	6 Oct 2009 21:24:48 -0000	1.5
>+++ src/org/eclipse/equinox/p2/tests/ui/query/AbstractQueryTest.java	2 Nov 2009 22:24:04 -0000
>@@ -11,7 +11,7 @@
> package org.eclipse.equinox.p2.tests.ui.query;
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.ui.policy.IUViewQueryContext;
> import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy;
>@@ -43,7 +43,7 @@
> 		Policy.getDefault().setQueryContext(null);
> 	}
> 
>-	protected Query getMockQuery() {
>+	protected IQuery getMockQuery() {
> 		return new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				return true;
>Index: src/org/eclipse/equinox/p2/tests/ui/query/AvailableIUWrapperTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/AvailableIUWrapperTest.java,v
>retrieving revision 1.3.2.1
>diff -u -r1.3.2.1 AvailableIUWrapperTest.java
>--- src/org/eclipse/equinox/p2/tests/ui/query/AvailableIUWrapperTest.java	22 Oct 2009 01:02:53 -0000	1.3.2.1
>+++ src/org/eclipse/equinox/p2/tests/ui/query/AvailableIUWrapperTest.java	2 Nov 2009 22:24:04 -0000
>@@ -149,7 +149,7 @@
> 		assertEquals("1.2", notInstalled, getIU(iuElement));
> 	}
> 
>-	protected Query getMockQuery() {
>+	protected IQuery getMockQuery() {
> 		return new IUPropertyQuery("key", "value");
> 	}
> }
>Index: src/org/eclipse/equinox/p2/tests/ui/query/MockQueryProvider.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/MockQueryProvider.java,v
>retrieving revision 1.3
>diff -u -r1.3 MockQueryProvider.java
>--- src/org/eclipse/equinox/p2/tests/ui/query/MockQueryProvider.java	6 Oct 2009 21:24:48 -0000	1.3
>+++ src/org/eclipse/equinox/p2/tests/ui/query/MockQueryProvider.java	2 Nov 2009 22:24:05 -0000
>@@ -13,7 +13,7 @@
> import org.eclipse.equinox.internal.p2.ui.DefaultQueryProvider;
> import org.eclipse.equinox.internal.p2.ui.model.QueriedElement;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> import org.eclipse.equinox.internal.provisional.p2.ui.ElementQueryDescriptor;
> import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy;
> import org.eclipse.equinox.p2.tests.MockQueryable;
>@@ -22,9 +22,9 @@
> * A fake query provider for unit testing.
> */
> public class MockQueryProvider extends DefaultQueryProvider {
>-	private Query query;
>+	private IQuery query;
> 
>-	public MockQueryProvider(Query query) {
>+	public MockQueryProvider(IQuery query) {
> 		super(Policy.getDefault());
> 		this.query = query;
> 	}
>Index: src/org/eclipse/equinox/p2/tests/ui/query/QueryDescriptorTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryDescriptorTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 QueryDescriptorTest.java
>--- src/org/eclipse/equinox/p2/tests/ui/query/QueryDescriptorTest.java	6 Oct 2009 21:24:48 -0000	1.2
>+++ src/org/eclipse/equinox/p2/tests/ui/query/QueryDescriptorTest.java	2 Nov 2009 22:24:05 -0000
>@@ -24,7 +24,7 @@
> 	class SimpleQueryable implements IQueryable {
> 		List elements = Arrays.asList(new String[] {"a", "b", "c", "d", "e"});
> 
>-		public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+		public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 			return query.perform(elements.iterator(), collector);
> 		}
> 	}
>@@ -98,7 +98,7 @@
> 	}
> 
> 	public void testCompoundDescriptorAND() {
>-		Query query = CompoundQuery.createCompoundQuery(new Query[] {new SimpleMatchQuery(), new SimpleMatchQuery2()}, true);
>+		IQuery query = CompoundQuery.createCompoundQuery(new IQuery[] {new SimpleMatchQuery(), new SimpleMatchQuery2()}, true);
> 		ElementQueryDescriptor eqDescriptor = new ElementQueryDescriptor(new SimpleQueryable(), query, new Collector(), new StringWrapper());
> 		Collection collection = eqDescriptor.performQuery(null);
> 		assertEquals("1.0", 1, collection.size());
>@@ -106,7 +106,7 @@
> 	}
> 
> 	public void testCompoundDescriptorOR() {
>-		Query query = CompoundQuery.createCompoundQuery(new Query[] {new SimpleMatchQuery(), new SimpleMatchQuery2()}, false);
>+		IQuery query = CompoundQuery.createCompoundQuery(new IQuery[] {new SimpleMatchQuery(), new SimpleMatchQuery2()}, false);
> 		ElementQueryDescriptor eqDescriptor = new ElementQueryDescriptor(new SimpleQueryable(), query, new Collector(), new StringWrapper());
> 		Collection collection = eqDescriptor.performQuery(null);
> 		assertEquals("1.0", 3, collection.size());
>#P org.eclipse.equinox.p2.tools
>Index: src/org/eclipse/equinox/internal/p2/tools/mirror/RepositoryMirroring.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/mirror/RepositoryMirroring.java,v
>retrieving revision 1.9
>diff -u -r1.9 RepositoryMirroring.java
>--- src/org/eclipse/equinox/internal/p2/tools/mirror/RepositoryMirroring.java	6 Oct 2009 21:24:49 -0000	1.9
>+++ src/org/eclipse/equinox/internal/p2/tools/mirror/RepositoryMirroring.java	2 Nov 2009 22:24:06 -0000
>@@ -13,7 +13,7 @@
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
> 
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
> 
>@@ -92,7 +92,7 @@
> 		}
> 	}
> 
>-	public void mirrorMetadata(Query query) throws ProvisionException {
>+	public void mirrorMetadata(IQuery query) throws ProvisionException {
> 		Collector result = metadataSourceRepository.query(query, new Collector(), null);
> 		mirrorMetadata((IInstallableUnit[]) result.toArray(IInstallableUnit.class));
> 	}
>#P org.eclipse.equinox.p2.ui
>Index: src/org/eclipse/equinox/internal/p2/ui/DefaultQueryProvider.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/DefaultQueryProvider.java,v
>retrieving revision 1.21.2.1
>diff -u -r1.21.2.1 DefaultQueryProvider.java
>--- src/org/eclipse/equinox/internal/p2/ui/DefaultQueryProvider.java	29 Oct 2009 22:53:22 -0000	1.21.2.1
>+++ src/org/eclipse/equinox/internal/p2/ui/DefaultQueryProvider.java	2 Nov 2009 22:24:07 -0000
>@@ -37,7 +37,7 @@
> 
> 	private Policy policy;
> 
>-	private Query allQuery = new MatchQuery() {
>+	private IQuery allQuery = new MatchQuery() {
> 		public boolean isMatch(Object candidate) {
> 			return true;
> 		}
>@@ -85,15 +85,15 @@
> 					}
> 				}
> 
>-				Query topLevelQuery = new IUPropertyQuery(context.getVisibleAvailableIUProperty(), Boolean.TRUE.toString());
>-				Query categoryQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.toString(true));
>+				IQuery topLevelQuery = new IUPropertyQuery(context.getVisibleAvailableIUProperty(), Boolean.TRUE.toString());
>+				IQuery categoryQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.toString(true));
> 
> 				// Showing child IU's of a group of repositories, or of a single repository
> 				if (element instanceof MetadataRepositories || element instanceof MetadataRepositoryElement) {
> 					if (context.getViewType() == IUViewQueryContext.AVAILABLE_VIEW_FLAT || !context.getUseCategories()) {
> 						AvailableIUWrapper wrapper = new AvailableIUWrapper(queryable, element, false, context.getShowAvailableChildren());
> 						if (showLatest)
>-							topLevelQuery = new PipedQuery(new Query[] {topLevelQuery, new LatestIUVersionQuery()});
>+							topLevelQuery = new PipedQuery(new IQuery[] {topLevelQuery, new LatestIUVersionQuery()});
> 						if (targetProfile != null)
> 							wrapper.markInstalledIUs(targetProfile, hideInstalled);
> 						return new ElementQueryDescriptor(queryable, topLevelQuery, new Collector(), wrapper);
>@@ -108,7 +108,7 @@
> 					// children of a category should drill down according to the context. If we aren't in a category, we are already drilling down and
> 					// continue to do so.
> 					boolean drillDown = element instanceof CategoryElement ? context.getShowAvailableChildren() : true;
>-					Query meetsAnyRequirementQuery = new AnyRequiredCapabilityQuery(((IIUElement) element).getRequirements());
>+					IQuery meetsAnyRequirementQuery = new AnyRequiredCapabilityQuery(((IIUElement) element).getRequirements());
> 					availableIUWrapper = new AvailableIUWrapper(queryable, element, true, drillDown);
> 					if (targetProfile != null)
> 						availableIUWrapper.markInstalledIUs(targetProfile, hideInstalled);
>@@ -116,12 +116,12 @@
> 					// be visible in the category.
> 					if (element instanceof CategoryElement) {
> 						if (showLatest)
>-							meetsAnyRequirementQuery = new PipedQuery(new Query[] {meetsAnyRequirementQuery, new LatestIUVersionQuery()});
>+							meetsAnyRequirementQuery = new PipedQuery(new IQuery[] {meetsAnyRequirementQuery, new LatestIUVersionQuery()});
> 						return new ElementQueryDescriptor(queryable, meetsAnyRequirementQuery, new Collector(), availableIUWrapper);
> 					}
>-					Query query = CompoundQuery.createCompoundQuery(new Query[] {topLevelQuery, meetsAnyRequirementQuery}, true);
>+					IQuery query = CompoundQuery.createCompoundQuery(new IQuery[] {topLevelQuery, meetsAnyRequirementQuery}, true);
> 					if (showLatest)
>-						query = new PipedQuery(new Query[] {query, new LatestIUVersionQuery()});
>+						query = new PipedQuery(new IQuery[] {query, new LatestIUVersionQuery()});
> 					// If it's not a category, these are generic requirements and should be filtered by the visibility property (topLevelQuery)
> 					return new ElementQueryDescriptor(queryable, query, new Collector(), availableIUWrapper);
> 				}
>@@ -155,9 +155,9 @@
> 			case QueryProvider.INSTALLED_IUS :
> 				// Querying of IU's. We are drilling down into the requirements.
> 				if (element instanceof IIUElement && context.getShowInstallChildren()) {
>-					Query meetsAnyRequirementQuery = new AnyRequiredCapabilityQuery(((IIUElement) element).getRequirements());
>-					Query visibleAsAvailableQuery = new IUPropertyQuery(context.getVisibleAvailableIUProperty(), Boolean.TRUE.toString());
>-					return new ElementQueryDescriptor(queryable, CompoundQuery.createCompoundQuery(new Query[] {visibleAsAvailableQuery, meetsAnyRequirementQuery}, true), new Collector(), new InstalledIUElementWrapper(queryable, element));
>+					IQuery meetsAnyRequirementQuery = new AnyRequiredCapabilityQuery(((IIUElement) element).getRequirements());
>+					IQuery visibleAsAvailableQuery = new IUPropertyQuery(context.getVisibleAvailableIUProperty(), Boolean.TRUE.toString());
>+					return new ElementQueryDescriptor(queryable, CompoundQuery.createCompoundQuery(new IQuery[] {visibleAsAvailableQuery, meetsAnyRequirementQuery}, true), new Collector(), new InstalledIUElementWrapper(queryable, element));
> 				}
> 				profile = (IProfile) ProvUI.getAdapter(element, IProfile.class);
> 				if (profile == null)
>Index: src/org/eclipse/equinox/internal/p2/ui/query/QueryableProfileRegistry.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/QueryableProfileRegistry.java,v
>retrieving revision 1.6
>diff -u -r1.6 QueryableProfileRegistry.java
>--- src/org/eclipse/equinox/internal/p2/ui/query/QueryableProfileRegistry.java	6 Oct 2009 21:24:20 -0000	1.6
>+++ src/org/eclipse/equinox/internal/p2/ui/query/QueryableProfileRegistry.java	2 Nov 2009 22:24:07 -0000
>@@ -27,7 +27,7 @@
> */
> public class QueryableProfileRegistry implements IQueryable {
> 
>-	public Collector query(Query query, Collector result, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector result, IProgressMonitor monitor) {
> 		IProfileRegistry profileRegistry = (IProfileRegistry) ServiceHelper.getService(ProvUIActivator.getContext(), IProfileRegistry.class.getName());
> 		if (profileRegistry == null) {
> 			ProvUI.reportStatus(new Status(IStatus.ERROR, ProvUIActivator.PLUGIN_ID, ProvUIMessages.ProvisioningUtil_NoProfileRegistryFound), StatusManager.SHOW | StatusManager.LOG);
>Index: src/org/eclipse/equinox/internal/p2/ui/query/QueryableUpdates.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/QueryableUpdates.java,v
>retrieving revision 1.8
>diff -u -r1.8 QueryableUpdates.java
>--- src/org/eclipse/equinox/internal/p2/ui/query/QueryableUpdates.java	6 Oct 2009 21:24:20 -0000	1.8
>+++ src/org/eclipse/equinox/internal/p2/ui/query/QueryableUpdates.java	2 Nov 2009 22:24:07 -0000
>@@ -34,7 +34,7 @@
> 		this.iusToUpdate = iusToUpdate;
> 	}
> 
>-	public Collector query(Query query, Collector result, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector result, IProgressMonitor monitor) {
> 		if (monitor == null)
> 			monitor = new NullProgressMonitor();
> 		int totalWork = 2000;
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/ElementQueryDescriptor.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ElementQueryDescriptor.java,v
>retrieving revision 1.6
>diff -u -r1.6 ElementQueryDescriptor.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/ElementQueryDescriptor.java	6 Oct 2009 21:24:20 -0000	1.6
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/ElementQueryDescriptor.java	2 Nov 2009 22:24:07 -0000
>@@ -24,7 +24,7 @@
> */
> public class ElementQueryDescriptor {
> 
>-	private Query query;
>+	private IQuery query;
> 	private Collector collector;
> 	private IQueryable queryable;
> 	private ElementWrapper wrapper;
>@@ -33,7 +33,7 @@
> 	 * Creates an ElementQueryDescriptor to represent a Query, its collector the queryable
> 	 * on which it will run.
> 	 */
>-	public ElementQueryDescriptor(IQueryable queryable, Query query, Collector collector) {
>+	public ElementQueryDescriptor(IQueryable queryable, IQuery query, Collector collector) {
> 		this(queryable, query, collector, null);
> 	}
> 
>@@ -41,7 +41,7 @@
> 	 * Creates an ElementQueryDescriptor to represent a Query, its collector the queryable
> 	 * on which it will run, and the transformer used to transform the results.
> 	 */
>-	public ElementQueryDescriptor(IQueryable queryable, Query query, Collector collector, ElementWrapper wrapper) {
>+	public ElementQueryDescriptor(IQueryable queryable, IQuery query, Collector collector, ElementWrapper wrapper) {
> 		this.query = query;
> 		this.collector = collector;
> 		this.queryable = queryable;
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableArtifactRepositoryManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableArtifactRepositoryManager.java,v
>retrieving revision 1.14
>diff -u -r1.14 QueryableArtifactRepositoryManager.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableArtifactRepositoryManager.java	6 Oct 2009 21:24:20 -0000	1.14
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableArtifactRepositoryManager.java	2 Nov 2009 22:24:07 -0000
>@@ -20,7 +20,7 @@
> import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
> import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.ui.policy.IUViewQueryContext;
>@@ -59,7 +59,7 @@
> 		return null;
> 	}
> 
>-	protected Collector query(URI[] uris, Query query, Collector collector, IProgressMonitor monitor) {
>+	protected Collector query(URI[] uris, IQuery query, Collector collector, IProgressMonitor monitor) {
> 		SubMonitor sub = SubMonitor.convert(monitor, uris.length * 100);
> 
> 		if (sub.isCanceled())
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableMetadataRepositoryManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableMetadataRepositoryManager.java,v
>retrieving revision 1.17
>diff -u -r1.17 QueryableMetadataRepositoryManager.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableMetadataRepositoryManager.java	6 Oct 2009 21:24:20 -0000	1.17
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableMetadataRepositoryManager.java	2 Nov 2009 22:24:07 -0000
>@@ -57,7 +57,7 @@
> 		return null;
> 	}
> 
>-	protected Collector query(URI uris[], Query query, Collector collector, IProgressMonitor monitor) {
>+	protected Collector query(URI uris[], IQuery query, Collector collector, IProgressMonitor monitor) {
> 		if (query instanceof RepositoryLocationQuery) {
> 			query.perform(Arrays.asList(uris).iterator(), collector);
> 			monitor.done();
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableRepositoryManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableRepositoryManager.java,v
>retrieving revision 1.12
>diff -u -r1.12 QueryableRepositoryManager.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableRepositoryManager.java	6 Oct 2009 21:24:20 -0000	1.12
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/QueryableRepositoryManager.java	2 Nov 2009 22:24:07 -0000
>@@ -71,7 +71,7 @@
> 	 * reporting is not desired
> 	 * @return The collector argument
> 	 */
>-	public Collector query(Query query, Collector result, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector result, IProgressMonitor monitor) {
> 		IRepositoryManager manager = getRepositoryManager();
> 		if (manager == null) {
> 			ProvUI.reportStatus(new Status(IStatus.ERROR, ProvUIActivator.PLUGIN_ID, ProvUIMessages.ProvisioningUtil_NoRepositoryManager), StatusManager.SHOW | StatusManager.LOG);
>@@ -229,7 +229,7 @@
> 	 */
> 	protected abstract IRepository doLoadRepository(IRepositoryManager manager, URI location, IProgressMonitor monitor) throws ProvisionException;
> 
>-	protected abstract Collector query(URI[] uris, Query query, Collector collector, IProgressMonitor monitor);
>+	protected abstract Collector query(URI[] uris, IQuery query, Collector collector, IProgressMonitor monitor);
> 
> 	public void setQueryContext(IUViewQueryContext queryContext) {
> 		this.queryContext = queryContext;
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/RepositoryLocationQuery.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/RepositoryLocationQuery.java,v
>retrieving revision 1.3
>diff -u -r1.3 RepositoryLocationQuery.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/RepositoryLocationQuery.java	6 Oct 2009 21:24:20 -0000	1.3
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/RepositoryLocationQuery.java	2 Nov 2009 22:24:07 -0000
>@@ -16,7 +16,7 @@
> import java.net.URI;
> import java.util.Iterator;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> import org.eclipse.equinox.internal.provisional.p2.repository.IRepository;
> 
> /**
>@@ -27,7 +27,7 @@
> * 
> * @since 3.5
> */
>-public class RepositoryLocationQuery implements Query {
>+public class RepositoryLocationQuery implements IQuery {
> 
> 	/**
> 	 * Gets the ID for this Query. 
>#P org.eclipse.equinox.p2.ui.sdk.scheduler
>Index: src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateScheduler.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateScheduler.java,v
>retrieving revision 1.10
>diff -u -r1.10 AutomaticUpdateScheduler.java
>--- src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateScheduler.java	6 Oct 2009 21:24:17 -0000	1.10
>+++ src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateScheduler.java	2 Nov 2009 22:24:10 -0000
>@@ -10,7 +10,7 @@
> *******************************************************************************/
> package org.eclipse.equinox.internal.p2.ui.sdk.scheduler;
> 
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> import com.ibm.icu.util.Calendar;
> import com.ibm.icu.util.ULocale;
>@@ -166,7 +166,7 @@
> 
> 	}
> 
>-	private Query getProfileQuery() {
>+	private IQuery getProfileQuery() {
> 		// We specifically avoid going through the default policy's query provider or
> 		// through the sdk ui bundle, so that we don't load all the p2 UI classes in doing so. 
> 		return new IUProfilePropertyByIdQuery(IInstallableUnit.PROP_PROFILE_ROOT_IU, Boolean.toString(true));
>#P org.eclipse.equinox.p2.updatechecker
>Index: src/org/eclipse/equinox/internal/p2/updatechecker/UpdateChecker.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/p2/updatechecker/UpdateChecker.java,v
>retrieving revision 1.12
>diff -u -r1.12 UpdateChecker.java
>--- src/org/eclipse/equinox/internal/p2/updatechecker/UpdateChecker.java	6 Oct 2009 21:24:19 -0000	1.12
>+++ src/org/eclipse/equinox/internal/p2/updatechecker/UpdateChecker.java	2 Nov 2009 22:24:11 -0000
>@@ -12,7 +12,7 @@
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
> 
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> import java.net.URI;
> import java.text.SimpleDateFormat;
>@@ -52,9 +52,9 @@
> 		long poll, delay;
> 		IUpdateListener listener;
> 		String profileId;
>-		Query query;
>+		IQuery query;
> 
>-		UpdateCheckThread(String profileId, Query query, long delay, long poll, IUpdateListener listener) {
>+		UpdateCheckThread(String profileId, IQuery query, long delay, long poll, IUpdateListener listener) {
> 			this.poll = poll;
> 			this.delay = delay;
> 			this.profileId = profileId;
>@@ -96,7 +96,7 @@
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.equinox.internal.provisional.p2.updatechecker.IUpdateChecker#addUpdateCheck(java.lang.String, long, long, org.eclipse.equinox.internal.provisional.p2.updatechecker.IUpdateListener)
> 	 */
>-	public void addUpdateCheck(String profileId, Query query, long delay, long poll, IUpdateListener listener) {
>+	public void addUpdateCheck(String profileId, IQuery query, long delay, long poll, IUpdateListener listener) {
> 		if (checkers.containsKey(listener))
> 			return;
> 		trace("Adding update checker for " + profileId + " at " + getTimeStamp()); //$NON-NLS-1$ //$NON-NLS-2$
>@@ -116,7 +116,7 @@
> 	 * Return the array of ius in the profile that have updates
> 	 * available.
> 	 */
>-	IInstallableUnit[] checkForUpdates(String profileId, Query query) {
>+	IInstallableUnit[] checkForUpdates(String profileId, IQuery query) {
> 		IProfile profile = getProfileRegistry().getProfile(profileId);
> 		ArrayList iusWithUpdates = new ArrayList();
> 		if (profile == null)
>Index: src/org/eclipse/equinox/internal/provisional/p2/updatechecker/IUpdateChecker.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/provisional/p2/updatechecker/IUpdateChecker.java,v
>retrieving revision 1.4
>diff -u -r1.4 IUpdateChecker.java
>--- src/org/eclipse/equinox/internal/provisional/p2/updatechecker/IUpdateChecker.java	6 Oct 2009 21:24:19 -0000	1.4
>+++ src/org/eclipse/equinox/internal/provisional/p2/updatechecker/IUpdateChecker.java	2 Nov 2009 22:24:11 -0000
>@@ -10,7 +10,7 @@
> *******************************************************************************/
> package org.eclipse.equinox.internal.provisional.p2.updatechecker;
> 
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> 
> /**
> * An update checker periodically polls for updates to specified profiles and
>@@ -41,7 +41,7 @@
> 	 * @param listener The listener to be notified of updates
> 	 * @see #removeUpdateCheck(IUpdateListener)
> 	 */
>-	public abstract void addUpdateCheck(String profileId, Query iusToCheckQuery, long delay, long poll, IUpdateListener listener);
>+	public abstract void addUpdateCheck(String profileId, IQuery iusToCheckQuery, long delay, long poll, IUpdateListener listener);
> 
> 	/**
> 	 * Removes an update listener from the set of listeners registered with this update
>@@ -50,7 +50,7 @@
> 	 * no effect.
> 	 * 
> 	 * @param listener The listener to remove
>-	 * @see #addUpdateCheck(String, Query, long, long, IUpdateListener)
>+	 * @see #addUpdateCheck(String, IQuery, long, long, IUpdateListener)
> 	 */
> 	public abstract void removeUpdateCheck(IUpdateListener listener);
> 
>#P org.eclipse.equinox.p2.updatesite
>Index: src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java,v
>retrieving revision 1.26.2.2
>diff -u -r1.26.2.2 SiteXMLAction.java
>--- src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java	29 Oct 2009 22:53:28 -0000	1.26.2.2
>+++ src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java	2 Nov 2009 22:24:12 -0000
>@@ -120,14 +120,14 @@
> 		String id = feature.getFeatureIdentifier() + ".feature.group"; //$NON-NLS-1$
> 		String versionString = feature.getFeatureVersion();
> 		Version version = versionString != null && versionString.length() > 0 ? Version.create(versionString) : Version.emptyVersion;
>-		Query query = null;
>+		IQuery query = null;
> 		Collector collector = null;
> 		if (version.equals(Version.emptyVersion)) {
>-			query = new PipedQuery(new Query[] {new InstallableUnitQuery(id), new LatestIUVersionQuery()});
>+			query = new PipedQuery(new IQuery[] {new InstallableUnitQuery(id), new LatestIUVersionQuery()});
> 			collector = new Collector();
> 		} else if (version.getQualifier() != null && version.getQualifier().endsWith(QUALIFIER)) {
> 			final String v = versionString.substring(0, versionString.indexOf(QUALIFIER));
>-			Query qualifierQuery = new InstallableUnitQuery(id) {
>+			IQuery qualifierQuery = new InstallableUnitQuery(id) {
> 				private String qualifierVersion = v.endsWith(".") ? v.substring(0, v.length() - 1) : v; //$NON-NLS-1$
> 
> 				public boolean isMatch(Object object) {
>@@ -138,7 +138,7 @@
> 					return false;
> 				}
> 			};
>-			query = new PipedQuery(new Query[] {qualifierQuery, new LatestIUVersionQuery()});
>+			query = new PipedQuery(new IQuery[] {qualifierQuery, new LatestIUVersionQuery()});
> 			collector = new Collector();
> 		} else {
> 			query = new InstallableUnitQuery(id, version);
>Index: src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java,v
>retrieving revision 1.41
>diff -u -r1.41 UpdateSiteMetadataRepository.java
>--- src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java	6 Oct 2009 21:24:19 -0000	1.41
>+++ src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java	2 Nov 2009 22:24:12 -0000
>@@ -15,7 +15,7 @@
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Query;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQuery;
> import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
> 
> public class UpdateSiteMetadataRepository implements IMetadataRepository {
>@@ -43,7 +43,7 @@
> 		throw new UnsupportedOperationException("Repository not modifiable: " + location); //$NON-NLS-1$
> 	}
> 
>-	public boolean removeInstallableUnits(Query query, IProgressMonitor monitor) {
>+	public boolean removeInstallableUnits(IQuery query, IProgressMonitor monitor) {
> 		throw new UnsupportedOperationException("Repository not modifiable: " + location); //$NON-NLS-1$
> 	}
> 
>@@ -99,7 +99,7 @@
> 		return delegate.getAdapter(adapter);
> 	}
> 
>-	public Collector query(Query query, Collector collector, IProgressMonitor monitor) {
>+	public Collector query(IQuery query, Collector collector, IProgressMonitor monitor) {
> 		return delegate.query(query, collector, monitor);
> 	}
> }
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 293339: 150886 | 150887 | 151131 | 151132