[Esbox-commits] r1864 - in trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard: . nokiabin

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-07-10 21:30:29 +0300 (Fri, 10 Jul 2009)
New Revision: 1864

Modified:
   trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1SDKWizard.java
   trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/FremantleWorkPage.java
   trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/NokiaBinariesInstallerEngine.java
Log:
Merge revs 1860:1863 from work_Ed branch -- tweaking for apt changes

Modified: trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1SDKWizard.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1SDKWizard.java	2009-07-10 18:16:54 UTC (rev 1863)
+++ trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1SDKWizard.java	2009-07-10 18:30:29 UTC (rev 1864)
@@ -213,7 +213,7 @@
 				public void run(IProgressMonitor monitor)
 						throws InvocationTargetException, InterruptedException {
 					
-					monitor.subTask("Installing targets...");
+					monitor.subTask("Installing Scratchbox...");
 
 					Scratchbox1SDKInstallerEngine engine = new Scratchbox1SDKInstallerEngine(
 							getShell(),

Modified: trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/FremantleWorkPage.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/FremantleWorkPage.java	2009-07-10 18:16:54 UTC (rev 1863)
+++ trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/FremantleWorkPage.java	2009-07-10 18:30:29 UTC (rev 1864)
@@ -29,6 +29,7 @@
 import org.maemo.mica.common.ui.TimeoutUI;
 import org.maemo.mica.internal.api.common.ui.wizards.WizardWorkProgressPageBase;
 import org.maemo.mica.internal.api.linux.packages.core.aptinstall.AptInstallerEngine;
+import org.maemo.mica.internal.api.linux.packages.core.aptinstall.AptYinodzPromptMonitor;
 import org.maemo.mica.internal.api.linux.packages.core.aptinstall.IAptInstallerWorkList;
 import org.maemo.mica.internal.api.linux.packages.core.aptpkgconfig.AptPackageManager;
 import org.maemo.mica.internal.api.linux.packages.core.aptpkgconfig.AptPackageManagerRegistry;
@@ -171,7 +172,7 @@
 						AptInstallerEngine engine = new AptInstallerEngine(getShell(), 
 								workPage.getProgressReporter(), workList);
 						engine.state().setNetworkTimeout(workPage.getTimeout());
-						
+						engine.state().queueStreamMonitor(new AptYinodzPromptMonitor(getShell(), workPage.getProgressReporter()));
 						status = engine.run(monitor);
 					} catch (MicaException e) {
 						status = Activator.createErrorStatus("Unexpected error:", e);

Modified: trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/NokiaBinariesInstallerEngine.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/NokiaBinariesInstallerEngine.java	2009-07-10 18:16:54 UTC (rev 1863)
+++ trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/NokiaBinariesInstallerEngine.java	2009-07-10 18:30:29 UTC (rev 1864)
@@ -23,6 +23,7 @@
 import org.maemo.mica.common.core.ui.IProgressReporter;
 import org.maemo.mica.internal.api.common.core.GeneralUtils;
 import org.maemo.mica.internal.api.linux.packages.core.aptinstall.AptInstallerEngine;
+import org.maemo.mica.internal.api.linux.packages.core.aptinstall.AptYinodzPromptMonitor;
 import org.maemo.mica.internal.api.linux.packages.core.aptinstall.IAptInstallerWorkList;
 import org.maemo.mica.internal.api.linux.packages.core.aptpkgconfig.AptPackageManager;
 import org.maemo.mica.internal.api.linux.packages.core.aptpkgconfig.AptPackageManagerRegistry;
@@ -147,6 +148,7 @@
 					
 					AptInstallerEngine engine = new AptInstallerEngine(shell, reporter, workList);
 					engine.state().setNetworkTimeout(timeout);
+					engine.state().queueStreamMonitor(new AptYinodzPromptMonitor(shell, reporter));
 					
 					status = engine.run(monitor);
 				} catch (MicaException e) {