core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/wizard/FeatureInstallOperation.java
changeset 1826 48569468eaf3
parent 1824 7e34f628583a
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/wizard/FeatureInstallOperation.java	Fri Aug 13 11:58:38 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/wizard/FeatureInstallOperation.java	Fri Aug 13 13:39:46 2010 -0500
@@ -26,6 +26,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.equinox.p2.core.ProvisionException;
@@ -35,6 +36,7 @@
 import org.eclipse.equinox.p2.operations.RepositoryTracker;
 import org.eclipse.equinox.p2.query.IQuery;
 import org.eclipse.equinox.p2.query.IQueryResult;
+import org.eclipse.equinox.p2.query.IQueryable;
 import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
@@ -44,7 +46,7 @@
 
 import com.nokia.carbide.discovery.ui.Messages;
 
-public class FeatureInstallOperation implements IRunnableWithProgress {
+class FeatureInstallOperation implements IRunnableWithProgress {
 	
 	private Collection<URI> uris;
 	private Collection<FeatureInfo> featureInfos;
@@ -80,7 +82,9 @@
 		Display.getDefault().asyncExec(new Runnable() {
 			@Override
 			public void run() {
-				provisioningUI.openInstallWizard(ius, operation, null);
+				IQueryable<IInstallableUnit> additions = operation.getProvisioningPlan().getAdditions();
+				IQueryResult<IInstallableUnit> result = additions.query(QueryUtil.createIUGroupQuery(), new NullProgressMonitor());
+				provisioningUI.openInstallWizard(result.toSet(), operation, null);
 			}
 		});
 	}
@@ -140,15 +144,6 @@
 		monitor.done();
 	}
 	
-//	private FeatureInfo findInfo(Collection<FeatureInfo> featureInfos, String id, Version version) {
-//		for (FeatureInfo featureInfo : featureInfos) {
-//			boolean sameId = featureInfo.getId().equals(id);
-//			if (sameId && (!wantVersions || version.toString().equals(featureInfo.getVersion().toString())))
-//				return featureInfo;
-//		}
-//		return null;
-//	}
-	
 	private InstallOperation resolve(SubMonitor monitor) throws CoreException {
 		checkIfCanceled(monitor);
 		URI[] uris = (URI[]) urisUsed.toArray(new URI[urisUsed.size()]);