Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2009-12-10 02:29:36 +0000
committerJohn Arthorne2009-12-10 02:29:36 +0000
commit5791da376e21dd8446f212d788c62c1595dbf273 (patch)
tree4327294603626a68b919e1ffbc5163b2796aebfe
parent0ec869ee976f47dda6a2a1072cb251bb169df5d5 (diff)
downloadrt.equinox.p2-5791da376e21dd8446f212d788c62c1595dbf273.tar.gz
rt.equinox.p2-5791da376e21dd8446f212d788c62c1595dbf273.tar.xz
rt.equinox.p2-5791da376e21dd8446f212d788c62c1595dbf273.zip
inline convenience method
-rw-r--r--bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java17
2 files changed, 2 insertions, 17 deletions
diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java
index f55f4b1b6..ddc449562 100644
--- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java
+++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java
@@ -460,7 +460,7 @@ public class ProvCommandProvider implements CommandProvider {
interpreter.println("Profile " + profileId + " not found");
return;
}
- IInstallableUnit[] units = sort(ProvisioningHelper.getInstallableUnits(profile, new GroupQuery(), new NullProgressMonitor()));
+ IInstallableUnit[] units = sort(profile.query(new GroupQuery(), new NullProgressMonitor()));
// Now print out results
for (int i = 0; i < units.length; i++)
println(interpreter, units[i]);
diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java
index 7cc7c69b1..87ef5efb0 100644
--- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java
+++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java
@@ -151,21 +151,6 @@ public class ProvisioningHelper {
* @param monitor A progress monitor, or <code>null</code>
* @return The IUs that match the query
*/
-
- public static Collector getInstallableUnits(IProfile profile, IQuery query, IProgressMonitor monitor) {
- return profile.query(query, monitor);
- }
-
- /**
- * Returns the installable units that match the given query
- * in the given metadata repository.
- *
- * @param location The location of the metadata repo to search. <code>null</code> indicates
- * search all known repos.
- * @param query The query to perform
- * @param monitor A progress monitor, or <code>null</code>
- * @return The IUs that match the query
- */
public static Collector getInstallableUnits(URI location, IQuery query, IProgressMonitor monitor) {
IQueryable queryable = null;
if (location == null) {
@@ -295,7 +280,7 @@ public class ProvisioningHelper {
public static IStatus uninstall(String unitId, String version, IProfile profile, IProgressMonitor progress) throws ProvisionException {
if (profile == null)
return null;
- Collector units = getInstallableUnits(profile, new InstallableUnitQuery(unitId, Version.create(version)), progress);
+ Collector units = profile.query(new InstallableUnitQuery(unitId, Version.create(version)), progress);
if (units.isEmpty()) {
StringBuffer error = new StringBuffer();
error.append("Installable unit not found: " + unitId + ' ' + version + '\n');

Back to the top