[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[p2-dev] Adios Collectors

The IQueryable (and all subtypes like repositories) no longer take the collector as an argument. You now query these things as follows:

IQueryable#query(IQuery query, IProgressMonitor monitor) : Collector

That is, you pass a query and *it* returns the collector.  There will likely be a few more changes (namely around what exactly gets returned), but those should be much easier than this change.  All the tests were passing for me (except a few UI tests which were failing before); however, if there is a big problem I tagged the repository before I committed the code. 

There were a lot of conflicts with Simon's stuff, but I think I sorted it out :-).  I have also created a single patch for PDE (and o.e.ui.ide) that includes both Simon's changes and mine. It's attached to this message and on [1].

[1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=292691

I should be on-line about 8:00am PST / 11:00am EST if there are any questions.

cheers,
Ian

--
R. Ian Bull | EclipseSource Victoria | +1 250 477 7484
http://eclipsesource.com | http://twitter.com/eclipsesource
### Eclipse Workspace Patch 1.0
#P org.eclipse.pde.build
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/META-INF/MANIFEST.MF,v
retrieving revision 1.37.2.5
diff -u -r1.37.2.5 MANIFEST.MF
--- META-INF/MANIFEST.MF	7 Dec 2009 19:26:17 -0000	1.37.2.5
+++ META-INF/MANIFEST.MF	8 Dec 2009 07:11:55 -0000
@@ -28,12 +28,12 @@
  org.eclipse.pde.internal.swt.tools;x-internal:=true
 Import-Package: com.ibm.icu.util,
  org.eclipse.equinox.internal.p2.core.helpers,
+ org.eclipse.equinox.internal.p2.engine,
  org.eclipse.equinox.internal.p2.engine.phases,
  org.eclipse.equinox.internal.p2.metadata,
  org.eclipse.equinox.internal.p2.updatesite;resolution:=optional,
  org.eclipse.equinox.internal.provisional.frameworkadmin,
  org.eclipse.equinox.internal.provisional.p2.core,
- org.eclipse.equinox.internal.provisional.p2.engine,
  org.eclipse.equinox.internal.provisional.p2.metadata,
  org.eclipse.equinox.internal.provisional.p2.metadata.query,
  org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,
Index: src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java
===================================================================
RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java,v
retrieving revision 1.12.2.7
diff -u -r1.12.2.7 BrandP2Task.java
--- src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java	7 Dec 2009 19:26:18 -0000	1.12.2.7
+++ src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java	8 Dec 2009 07:11:55 -0000
@@ -20,12 +20,12 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.URIUtil;
 import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
+import org.eclipse.equinox.internal.p2.engine.Phase;
+import org.eclipse.equinox.internal.p2.engine.PhaseSet;
 import org.eclipse.equinox.internal.p2.engine.phases.Collect;
 import org.eclipse.equinox.internal.p2.engine.phases.Install;
 import org.eclipse.equinox.internal.p2.metadata.*;
 import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
-import org.eclipse.equinox.internal.provisional.p2.engine.Phase;
-import org.eclipse.equinox.internal.provisional.p2.engine.PhaseSet;
 import org.eclipse.equinox.internal.provisional.p2.metadata.*;
 import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
 import org.eclipse.equinox.p2.internal.repository.tools.Repo2Runnable;
#P org.eclipse.pde.build.tests
Index: src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java
===================================================================
RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java,v
retrieving revision 1.15.2.3
diff -u -r1.15.2.3 P2TestCase.java
--- src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java	7 Dec 2009 04:35:21 -0000	1.15.2.3
+++ src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java	8 Dec 2009 07:11:56 -0000
@@ -8,8 +8,6 @@
  *******************************************************************************/
 package org.eclipse.pde.build.internal.tests.p2;
 
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-
 import java.io.File;
 import java.net.URI;
 import java.util.*;
@@ -24,8 +22,7 @@
 import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
 import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
 import org.eclipse.equinox.p2.internal.repository.tools.RepositoryUtilities;
-import org.eclipse.equinox.p2.metadata.IArtifactKey;
-import org.eclipse.equinox.p2.metadata.IRequirement;
+import org.eclipse.equinox.p2.metadata.*;
 import org.eclipse.equinox.p2.repository.artifact.*;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
@@ -156,7 +153,7 @@
 	}
 
 	public IInstallableUnit getIU(IMetadataRepository repository, String name, boolean assertNotNull) {
-		Collector collector = repository.query(new InstallableUnitQuery(name), new Collector(), null);
+		Collector collector = repository.query(new InstallableUnitQuery(name), null);
 
 		IInstallableUnit unit = null;
 		if (collector.size() > 0)
Index: src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java
===================================================================
RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java,v
retrieving revision 1.22.2.6
diff -u -r1.22.2.6 P2Tests.java
--- src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java	7 Dec 2009 04:35:21 -0000	1.22.2.6
+++ src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java	8 Dec 2009 07:11:56 -0000
@@ -9,10 +9,6 @@
 
 package org.eclipse.pde.build.internal.tests.p2;
 
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-
-import org.eclipse.equinox.p2.metadata.IArtifactKey;
-
 import java.io.*;
 import java.net.URL;
 import java.util.*;
@@ -24,6 +20,8 @@
 import org.eclipse.core.runtime.*;
 import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
 import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.repository.artifact.*;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.pde.build.internal.tests.Utils;
@@ -514,7 +512,7 @@
 		Map repoProps = repository.getProperties();
 		assertEquals(repoProps.get("publishPackFilesAsSiblings"), "true");
 		final String PACKED_FORMAT = "packed"; //$NON-NLS-1$
-		Collector keys = repository.query(ArtifactKeyQuery.ALL_KEYS, new Collector(), null);
+		Collector keys = repository.query(ArtifactKeyQuery.ALL_KEYS, null);
 		for (Iterator iterator = keys.iterator(); iterator.hasNext();) {
 			IArtifactKey key = (IArtifactKey) iterator.next();
 			IArtifactDescriptor[] descriptors = repository.getArtifactDescriptors(key);
Index: src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java
===================================================================
RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java,v
retrieving revision 1.83.2.5
diff -u -r1.83.2.5 PublishingTests.java
--- src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java	7 Dec 2009 04:35:21 -0000	1.83.2.5
+++ src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java	8 Dec 2009 07:11:57 -0000
@@ -9,10 +9,6 @@
 
 package org.eclipse.pde.build.internal.tests.p2;
 
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-
-import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
-
 import java.io.File;
 import java.io.FilenameFilter;
 import java.net.URI;
@@ -25,9 +21,12 @@
 import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
-import org.eclipse.equinox.internal.provisional.p2.metadata.*;
+import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
+import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
+import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
 import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
 import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.metadata.IRequirement;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.osgi.util.ManifestElement;
@@ -1322,7 +1321,7 @@
 
 		URI repoURI = URIUtil.fromString("file:" + buildFolder.getFolder("buildRepo").getLocation().toOSString());
 		IMetadataRepository metadata = loadMetadataRepository(repoURI);
-		Collector collector = metadata.query(new InstallableUnitQuery("a"), new Collector(), null);
+		Collector collector = metadata.query(new InstallableUnitQuery("a"), null);
 		assertTrue(collector.size() == 0);
 		getIU(metadata, "b");
 	}
#P org.eclipse.pde.core
Index: src/org/eclipse/pde/internal/core/P2Utils.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java,v
retrieving revision 1.20.6.5
diff -u -r1.20.6.5 P2Utils.java
--- src/org/eclipse/pde/internal/core/P2Utils.java	7 Dec 2009 20:25:37 -0000	1.20.6.5
+++ src/org/eclipse/pde/internal/core/P2Utils.java	8 Dec 2009 07:11:59 -0000
@@ -11,24 +11,23 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.core;
 
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.*;
 import org.eclipse.core.runtime.*;
+import org.eclipse.equinox.internal.p2.engine.PhaseSet;
 import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
 import org.eclipse.equinox.internal.provisional.p2.director.PlannerHelper;
-import org.eclipse.equinox.internal.provisional.p2.engine.*;
 import org.eclipse.equinox.internal.provisional.p2.metadata.*;
 import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
 import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
 import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
 import org.eclipse.equinox.p2.core.IProvisioningAgent;
 import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
-import org.eclipse.equinox.p2.engine.IEngine;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.metadata.IRequirement;
 import org.eclipse.osgi.service.resolver.*;
 import org.eclipse.pde.core.plugin.IPluginBase;
Index: src/org/eclipse/pde/internal/core/target/AbstractTargetHandle.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/AbstractTargetHandle.java,v
retrieving revision 1.3
diff -u -r1.3 AbstractTargetHandle.java
--- src/org/eclipse/pde/internal/core/target/AbstractTargetHandle.java	2 Jun 2009 21:14:41 -0000	1.3
+++ src/org/eclipse/pde/internal/core/target/AbstractTargetHandle.java	8 Dec 2009 07:11:59 -0000
@@ -10,12 +10,13 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.core.target;
 
+import org.eclipse.equinox.p2.engine.IProfile;
+import org.eclipse.equinox.p2.engine.IProfileRegistry;
+
 import java.io.File;
 import java.io.InputStream;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry;
 import org.eclipse.pde.internal.core.PDECore;
 import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
 import org.eclipse.pde.internal.core.target.provisional.ITargetHandle;
Index: src/org/eclipse/pde/internal/core/target/IUBundleContainer.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/IUBundleContainer.java,v
retrieving revision 1.5.2.6
diff -u -r1.5.2.6 IUBundleContainer.java
--- src/org/eclipse/pde/internal/core/target/IUBundleContainer.java	7 Dec 2009 20:25:37 -0000	1.5.2.6
+++ src/org/eclipse/pde/internal/core/target/IUBundleContainer.java	8 Dec 2009 07:12:00 -0000
@@ -10,22 +10,20 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.core.target;
 
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-
 import java.io.File;
 import java.net.URI;
 import java.util.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.equinox.internal.p2.director.PermissiveSlicer;
+import org.eclipse.equinox.internal.p2.engine.PhaseSet;
 import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
 import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
 import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
-import org.eclipse.equinox.internal.provisional.p2.engine.*;
 import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
 import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;
-import org.eclipse.equinox.p2.engine.IEngine;
-import org.eclipse.equinox.p2.engine.IProvisioningPlan;
+import org.eclipse.equinox.p2.engine.*;
 import org.eclipse.equinox.p2.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.repository.IRepositoryManager;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
 import org.eclipse.equinox.p2.repository.artifact.IFileArtifactRepository;
@@ -249,8 +247,7 @@
 
 		// query for bundles
 		OSGiBundleQuery query = new OSGiBundleQuery();
-		Collector collector = new Collector();
-		slice.query(query, collector, new SubProgressMonitor(subMonitor, 10));
+		Collector collector = slice.query(query, new SubProgressMonitor(subMonitor, 10));
 
 		if (subMonitor.isCanceled()) {
 			return new IResolvedBundle[0];
@@ -365,7 +362,7 @@
 			slicer = new PermissiveSlicer(allMetadata, props, true, false, false, true, false);
 		}
 		IQueryable slice = slicer.slice(units, new SubProgressMonitor(subMonitor, 10));
-		Collector collector = slice.query(InstallableUnitQuery.ANY, new Collector(), new SubProgressMonitor(subMonitor, 10));
+		Collector collector = slice.query(InstallableUnitQuery.ANY, new SubProgressMonitor(subMonitor, 10));
 
 		if (subMonitor.isCanceled() || collector.isEmpty()) {
 			return new IResolvedBundle[0];
@@ -407,7 +404,7 @@
 		}
 
 		// query for bundles
-		collector = slice.query(new OSGiBundleQuery(), new Collector(), new SubProgressMonitor(subMonitor, 10));
+		collector = slice.query(new OSGiBundleQuery(), new SubProgressMonitor(subMonitor, 10));
 
 		if (subMonitor.isCanceled()) {
 			return new IResolvedBundle[0];
@@ -472,13 +469,13 @@
 			fUnits = new IInstallableUnit[fIds.length];
 			for (int i = 0; i < fIds.length; i++) {
 				InstallableUnitQuery query = new InstallableUnitQuery(fIds[i], fVersions[i]);
-				Collector collector = profile.query(query, new Collector(), null);
+				Collector collector = profile.query(query, null);
 				if (collector.isEmpty()) {
 					// try repositories
 					URI[] repositories = resolveRepositories();
 					for (int j = 0; j < repositories.length; j++) {
 						IMetadataRepository repository = getRepository(repositories[j]);
-						collector = repository.query(query, new Collector(), null);
+						collector = repository.query(query, null);
 						if (!collector.isEmpty()) {
 							break;
 						}
Index: src/org/eclipse/pde/internal/core/target/TargetDefinition.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java,v
retrieving revision 1.6.2.2
diff -u -r1.6.2.2 TargetDefinition.java
--- src/org/eclipse/pde/internal/core/target/TargetDefinition.java	7 Dec 2009 20:25:37 -0000	1.6.2.2
+++ src/org/eclipse/pde/internal/core/target/TargetDefinition.java	8 Dec 2009 07:12:00 -0000
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.core.target;
 
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-
 import java.io.*;
 import java.util.*;
 import javax.xml.parsers.ParserConfigurationException;
@@ -19,11 +17,12 @@
 import org.eclipse.core.runtime.*;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry;
 import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
 import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
+import org.eclipse.equinox.p2.engine.IProfile;
+import org.eclipse.equinox.p2.engine.IProfileRegistry;
 import org.eclipse.equinox.p2.engine.query.IUProfilePropertyQuery;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.pde.internal.core.PDECore;
 import org.eclipse.pde.internal.core.target.provisional.*;
 import org.xml.sax.SAXException;
@@ -664,7 +663,7 @@
 				// still in the profile, we need to recreate (rather than uninstall)
 				IUProfilePropertyQuery propertyQuery = new IUProfilePropertyQuery(AbstractTargetHandle.PROP_INSTALLED_IU, Boolean.toString(true));
 				propertyQuery.setProfile(profile);
-				Collector collector = profile.query(propertyQuery, new Collector(), null);
+				Collector collector = profile.query(propertyQuery, null);
 				Iterator iterator = collector.iterator();
 				if (iterator.hasNext()) {
 					Set installedIUs = new HashSet();
Index: src/org/eclipse/pde/internal/core/target/TargetPlatformService.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java,v
retrieving revision 1.3.4.1
diff -u -r1.3.4.1 TargetPlatformService.java
--- src/org/eclipse/pde/internal/core/target/TargetPlatformService.java	7 Dec 2009 20:25:37 -0000	1.3.4.1
+++ src/org/eclipse/pde/internal/core/target/TargetPlatformService.java	8 Dec 2009 07:12:00 -0000
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.core.target;
 
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-
 import java.io.*;
 import java.net.*;
 import java.util.*;
@@ -19,8 +17,9 @@
 import org.eclipse.core.runtime.*;
 import org.eclipse.equinox.internal.p2.garbagecollector.GarbageCollector;
 import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry;
+import org.eclipse.equinox.p2.engine.IProfile;
+import org.eclipse.equinox.p2.engine.IProfileRegistry;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.osgi.service.datalocation.Location;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
#P org.eclipse.pde.ui
Index: src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java,v
retrieving revision 1.16.2.8
diff -u -r1.16.2.8 RuntimeInstallJob.java
--- src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java	7 Dec 2009 20:25:38 -0000	1.16.2.8
+++ src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java	8 Dec 2009 07:12:01 -0000
@@ -10,23 +10,21 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.ui.build;
 
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-
-import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
-
 import java.io.File;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.runtime.*;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
 import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry;
 import org.eclipse.equinox.internal.provisional.p2.metadata.*;
 import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
 import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitPatchDescription;
 import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;
+import org.eclipse.equinox.p2.engine.IProfile;
+import org.eclipse.equinox.p2.engine.IProfileRegistry;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.metadata.IRequirement;
 import org.eclipse.equinox.p2.operations.*;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
@@ -125,7 +123,7 @@
 
 				// Check if the right version exists in the new meta repo
 				Version newVersion = Version.parseVersion(version);
-				Collector queryMatches = metaRepo.query(new InstallableUnitQuery(id, newVersion), new Collector(), monitor);
+				Collector queryMatches = metaRepo.query(new InstallableUnitQuery(id, newVersion), monitor);
 				if (queryMatches.size() == 0) {
 					return new Status(IStatus.ERROR, PDEPlugin.getPluginId(), NLS.bind(PDEUIMessages.RuntimeInstallJob_ErrorCouldNotFindUnitInRepo, new String[] {id, version}));
 				}
@@ -133,7 +131,7 @@
 				IInstallableUnit iuToInstall = (IInstallableUnit) queryMatches.toArray(IInstallableUnit.class)[0];
 
 				// Find out if the profile already has that iu installed												
-				queryMatches = profile.query(new InstallableUnitQuery(id), new Collector(), new SubProgressMonitor(monitor, 0));
+				queryMatches = profile.query(new InstallableUnitQuery(id), new SubProgressMonitor(monitor, 0));
 				if (queryMatches.size() == 0) {
 					// Just install the new iu into the profile
 					toInstall.add(iuToInstall);
@@ -216,7 +214,7 @@
 				}
 				return false;
 			}
-		}, new Collector(), monitor);
+		}, monitor);
 		if (!queryMatches.isEmpty()) {
 			IInstallableUnit lifecycleUnit = (IInstallableUnit) queryMatches.toArray(IInstallableUnit.class)[0];
 			iuPatchDescription.setLifeCycle(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, lifecycleUnit.getId(), new VersionRange(lifecycleUnit.getVersion(), true, lifecycleUnit.getVersion(), true), null, false, false, false));
Index: src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java,v
retrieving revision 1.18
diff -u -r1.18 AddBundleContainerSelectionPage.java
--- src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java	28 May 2009 15:19:29 -0000	1.18
+++ src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java	8 Dec 2009 07:12:01 -0000
@@ -10,11 +10,12 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.ui.shared.target;
 
+import org.eclipse.equinox.p2.engine.IProfile;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
 import org.eclipse.jface.dialogs.*;
 import org.eclipse.jface.viewers.*;
 import org.eclipse.jface.wizard.*;
Index: src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java,v
retrieving revision 1.9.6.4
diff -u -r1.9.6.4 EditIUContainerPage.java
--- src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java	7 Dec 2009 20:25:38 -0000	1.9.6.4
+++ src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java	8 Dec 2009 07:12:01 -0000
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.ui.shared.target;
 
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import org.eclipse.core.runtime.*;
@@ -19,7 +17,8 @@
 import org.eclipse.equinox.internal.p2.ui.actions.PropertyDialogAction;
 import org.eclipse.equinox.internal.p2.ui.dialogs.*;
 import org.eclipse.equinox.internal.p2.ui.query.IUViewQueryContext;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
+import org.eclipse.equinox.p2.engine.IProfile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.ui.Policy;
 import org.eclipse.equinox.p2.ui.ProvisioningUI;
 import org.eclipse.jface.action.IAction;
Index: src/org/eclipse/pde/internal/ui/shared/target/StyledBundleLabelProvider.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/StyledBundleLabelProvider.java,v
retrieving revision 1.4.6.3
diff -u -r1.4.6.3 StyledBundleLabelProvider.java
--- src/org/eclipse/pde/internal/ui/shared/target/StyledBundleLabelProvider.java	7 Dec 2009 20:25:38 -0000	1.4.6.3
+++ src/org/eclipse/pde/internal/ui/shared/target/StyledBundleLabelProvider.java	8 Dec 2009 07:12:01 -0000
@@ -10,13 +10,12 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.ui.shared.target;
 
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-
 import com.ibm.icu.text.MessageFormat;
 import java.net.URI;
 import org.eclipse.core.runtime.*;
 import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
 import org.eclipse.equinox.p2.common.TranslationSupport;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.*;
 import org.eclipse.pde.internal.core.target.*;
Index: src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java,v
retrieving revision 1.9
diff -u -r1.9 TargetLocationsGroup.java
--- src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java	30 Jun 2009 20:02:23 -0000	1.9
+++ src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java	8 Dec 2009 07:12:02 -0000
@@ -10,9 +10,10 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.ui.shared.target;
 
+import org.eclipse.equinox.p2.engine.IProfile;
+
 import java.util.*;
 import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
 import org.eclipse.jface.viewers.*;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
#P org.eclipse.pde.ui.tests
Index: src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java,v
retrieving revision 1.6.2.3
diff -u -r1.6.2.3 IUBundleContainerTests.java
--- src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java	7 Dec 2009 20:25:40 -0000	1.6.2.3
+++ src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java	8 Dec 2009 07:12:03 -0000
@@ -74,7 +74,7 @@
 	 * @return installable unit
 	 */
 	protected IInstallableUnit getUnit(String id, IMetadataRepository repository) {
-		Collector result = repository.query(new InstallableUnitQuery(id), new Collector(), null);
+		Collector result = repository.query(new InstallableUnitQuery(id),  null);
 		IInstallableUnit[] units  = (IInstallableUnit[]) result.toArray(IInstallableUnit.class);
 		if (units.length == 1) {
 			return units[0];
#P org.eclipse.ui.ide
Index: src/org/eclipse/ui/internal/ide/dialogs/ConfigurationLogUpdateSection.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ConfigurationLogUpdateSection.java,v
retrieving revision 1.14
diff -u -r1.14 ConfigurationLogUpdateSection.java
--- src/org/eclipse/ui/internal/ide/dialogs/ConfigurationLogUpdateSection.java	13 Oct 2009 14:13:05 -0000	1.14
+++ src/org/eclipse/ui/internal/ide/dialogs/ConfigurationLogUpdateSection.java	8 Dec 2009 07:12:04 -0000
@@ -17,11 +17,11 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry;
-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.InstallableUnitQuery;
+import org.eclipse.equinox.p2.engine.IProfile;
+import org.eclipse.equinox.p2.engine.IProfileRegistry;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.osgi.service.resolver.BundleDescription;
 import org.eclipse.osgi.service.resolver.PlatformAdmin;
 import org.eclipse.osgi.service.resolver.State;
@@ -68,7 +68,7 @@
 			// Since this code is only called in the Help -> About -> Configuration Details case we
 			// won't worry too much about performance here and we will sort the query results
 			// afterwards, but before printing them out.
-			Collector collector = profile.available(InstallableUnitQuery.ANY, new Collector(), null);
+			Collector collector = profile.available(InstallableUnitQuery.ANY,  null);
 			SortedSet sorted = new TreeSet();
 			for (Iterator iter = collector.iterator(); iter.hasNext();) {
 				IInstallableUnit unit = (IInstallableUnit) iter.next();