[Esbox-commits] r2097 - trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-09-03 17:34:53 +0300 (Thu, 03 Sep 2009)
New Revision: 2097

Modified:
   trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/AfSbInitMaemoLauncherAdapter.java
Log:
Merge rev 2096 from work_Ed branch

Modified: trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/AfSbInitMaemoLauncherAdapter.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/AfSbInitMaemoLauncherAdapter.java	2009-09-03 13:03:52 UTC (rev 2096)
+++ trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/AfSbInitMaemoLauncherAdapter.java	2009-09-03 14:34:53 UTC (rev 2097)
@@ -160,7 +160,7 @@
 	public void restartMaemo(IProgressMonitor monitor) throws MicaException {
 		if (monitor == null)
 			monitor = new NullProgressMonitor();
-		monitor.beginTask("", 10);
+		monitor.beginTask("", IProgressMonitor.UNKNOWN);
 
 		ensureCorrectXRunning(new SubProgressMonitor(monitor, 1));
 		if (monitor.isCanceled())
@@ -176,7 +176,7 @@
 	public void startMaemo(IProgressMonitor monitor) throws MicaException {
 		if (monitor == null)
 			monitor = new NullProgressMonitor();
-		monitor.beginTask("", 10);
+		monitor.beginTask("",  IProgressMonitor.UNKNOWN);
 
 		ensureCorrectXRunning(new SubProgressMonitor(monitor, 1));
 		if (monitor.isCanceled())
@@ -383,7 +383,7 @@
 	public void stopMaemo(IProgressMonitor monitor) throws MicaException {
 		if (monitor == null)
 			monitor = new NullProgressMonitor();
-		monitor.beginTask("", 10);
+		monitor.beginTask("",  IProgressMonitor.UNKNOWN);
 
 		command.performCommand(MaemoPreferenceConstants.MAEMO_STOP_ACTION,
 				new SubProgressMonitor(monitor, 9));
@@ -488,12 +488,14 @@
 						// just hangs forever (waiting for input?)... dunno why.
 						// This happened at least as far back as 2.0.0M1 but
 						// there was no Job tracking, so we didn't notice.
+						
+						monitor.subTask("Waiting until complete...");
 						Job job = new Job("Finishing Maemo AF startup") {
 
 							@Override
 							protected IStatus run(IProgressMonitor xmonitor) {
 								try {
-									Thread.sleep(30000);
+									Thread.sleep(15000);
 								} catch (InterruptedException e) {
 								}
 								procMonitor.terminate();