[Esbox-commits] r1905 - in branches/work_Ed: org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-07-30 17:06:36 +0300 (Thu, 30 Jul 2009)
New Revision: 1905

Modified:
   branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java
   branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/XDropdownMenuAction.java
Log:
Allow stopping X without providing the target.

Modified: branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java	2009-07-29 20:28:05 UTC (rev 1904)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java	2009-07-30 14:06:36 UTC (rev 1905)
@@ -19,6 +19,7 @@
 import org.eclipse.core.runtime.jobs.Job;
 import org.maemo.esbox.internal.maemosdk.core.Activator;
 import org.maemo.mica.common.core.MicaException;
+import org.maemo.mica.common.core.preferences.CorePreferenceManager;
 import org.maemo.mica.common.core.sdk.ISDKTarget;
 
 /**
@@ -59,7 +60,7 @@
 		IMaemoLauncherAdapter launcher = (IMaemoLauncherAdapter) sdkTarget
 				.getAdapter(IMaemoLauncherAdapter.class);
 		if (launcher != null) {
-			previousTarget = sdkTarget;
+			previousTarget = null;
 			launcher.stopMaemo(monitor);
 		} else {
 			throw new MicaException("I do not know how to stop Maemo AF for " + sdkTarget.getDisplayName());
@@ -189,13 +190,13 @@
 	/**
 	 * Create a job to stop X.
 	 */
-	public Job createStopXJob(final ISDKTarget target) {
+	public Job createStopXJob() {
 		Job job = new Job("Stopping X Server") {
 
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
-					MaemoScriptLauncher.getInstance().stopX(target, monitor);
+					MaemoScriptLauncher.getInstance().stopX(monitor);
 				} catch (MicaException e) {
 					Activator.getErrorLogger().showError(null, e);
 				}
@@ -217,9 +218,8 @@
 	 * Stop the X server.
 	 * @param monitor 
 	 */
-	public void stopX(ISDKTarget sdkTarget, IProgressMonitor monitor) throws MicaException {
-		XLauncher.getInstance().stopX(sdkTarget, monitor);
-		previousTarget = sdkTarget;
+	public void stopX(IProgressMonitor monitor) throws MicaException {
+		XLauncher.getInstance().stopX(CorePreferenceManager.getInstance().getPreferenceProvider(), monitor);
 	}
 
 	/**

Modified: branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/XDropdownMenuAction.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/XDropdownMenuAction.java	2009-07-29 20:28:05 UTC (rev 1904)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/XDropdownMenuAction.java	2009-07-30 14:06:36 UTC (rev 1905)
@@ -70,10 +70,7 @@
 	 * Stop X
 	 */
 	protected void stopClicked() {
-		ISDKTarget target = getCurrentSDKTarget(MaemoScriptLauncher.getInstance().getPreviousTarget());
-		if (target == null)
-			return;
-		Job job = MaemoScriptLauncher.getInstance().createStopXJob(target);
+		Job job = MaemoScriptLauncher.getInstance().createStopXJob();
 		job.schedule();
 	}