[Esbox-commits] r2433 - in trunk: org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/execEnv

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-11-20 21:34:43 +0200 (Fri, 20 Nov 2009)
New Revision: 2433

Modified:
   trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java
   trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/XLauncher.java
   trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/execEnv/MaemoExecutionEnvironmentHandler.java
Log:
Merge rev 2432 from work_Ed branch

Modified: trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java	2009-11-20 19:16:24 UTC (rev 2432)
+++ trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java	2009-11-20 19:34:43 UTC (rev 2433)
@@ -18,6 +18,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.maemo.esbox.internal.maemosdk.core.Activator;
+import org.maemo.mica.common.core.MicaCanceledException;
 import org.maemo.mica.common.core.MicaException;
 import org.maemo.mica.common.core.preferences.CorePreferenceManager;
 import org.maemo.mica.common.core.sdk.ISDKTarget;
@@ -42,6 +43,9 @@
 		if (launcher != null) {
 			try {
 				return launcher.isMaemoRunning();
+			} catch (MicaCanceledException e) {
+				// ignore
+				return false;
 			} catch (MicaException e) {
 				Activator.getErrorLogger().logError("Cannot test Maemo AF status",
 						e);
@@ -109,6 +113,8 @@
 		      	
 				try {
 					MaemoScriptLauncher.getInstance().startMaemo(target, monitor);
+				} catch (MicaCanceledException e) {
+					// ignore
 				} catch (MicaException e) {
 					Activator.getErrorLogger().showError(null, e);
 				}
@@ -134,6 +140,8 @@
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					MaemoScriptLauncher.getInstance().restartMaemo(target, monitor);
+				} catch (MicaCanceledException e) {
+					// ignore
 				} catch (MicaException e) {
 					Activator.getErrorLogger().showError(null, e);
 				}
@@ -158,6 +166,8 @@
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					MaemoScriptLauncher.getInstance().stopMaemo(target, monitor);
+				} catch (MicaCanceledException e) {
+					// ignore
 				} catch (MicaException e) {
 					Activator.getErrorLogger().showError(null, e);
 				}
@@ -177,6 +187,8 @@
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					MaemoScriptLauncher.getInstance().startX(target, monitor);
+				} catch (MicaCanceledException e) {
+					// ignore
 				} catch (MicaException e) {
 					Activator.getErrorLogger().showError(null, e);
 				}
@@ -197,6 +209,8 @@
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					MaemoScriptLauncher.getInstance().stopX(monitor);
+				} catch (MicaCanceledException e) {
+					// ignore
 				} catch (MicaException e) {
 					Activator.getErrorLogger().showError(null, e);
 				}

Modified: trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/XLauncher.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/XLauncher.java	2009-11-20 19:16:24 UTC (rev 2432)
+++ trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/XLauncher.java	2009-11-20 19:34:43 UTC (rev 2433)
@@ -470,8 +470,10 @@
 		for (IProcess process : processes) {
 			try {		
 				process.terminate();
-				// check is X successfully stopped		
-				while(isXServerStarted(prefProvider)){
+				// check is X successfully stopped
+				long timeout = System.currentTimeMillis() + 10000;
+				
+				while(isXServerStarted(prefProvider) && System.currentTimeMillis() < timeout){
 					try {
 						Thread.sleep(500);
 					} catch (InterruptedException e) {

Modified: trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/execEnv/MaemoExecutionEnvironmentHandler.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/execEnv/MaemoExecutionEnvironmentHandler.java	2009-11-20 19:16:24 UTC (rev 2432)
+++ trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/execEnv/MaemoExecutionEnvironmentHandler.java	2009-11-20 19:34:43 UTC (rev 2433)
@@ -64,12 +64,14 @@
 			boolean isXRunning = XLauncher.getInstance().isXServerStarted(sdkTarget);
 			boolean wrongXRunning = !XLauncher.getInstance().isXServerCompatible(sdkTarget);
 			
+			boolean maemoRunning = MaemoScriptLauncher.getInstance().isMaemoStarted(sdkTarget);
+			
 			if (wrongOneRunning
-					|| !MaemoScriptLauncher.getInstance().isMaemoStarted(sdkTarget) 
+					|| !maemoRunning 
 					|| wrongXRunning) {
 				final boolean[] doLaunch = { false };
 				final String message = 
-					wrongOneRunning ? 
+					wrongOneRunning && maemoRunning ? 
 						"The Maemo Application Framework is running for a different target.\n\nThis may or may not be valid for the new application.\n\nSwitch to the new target (" + sdkTarget.getName() + ")?"
 						: isXRunning && wrongXRunning ?
 								"The Maemo Application Framework is running in an X server with an inappropriate configuration.\n\nRestart it now?"