Tue Oct 14 12:11:50 EEST 2008

Author: baranov
Date: 2008-10-14 12:11:49 +0300 (Tue, 14 Oct 2008)
New Revision: 870

Added:
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/commands/
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/commands/ICommandAbstractor.java
Removed:
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/command/ICommandAbstractor.java
Modified:
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/META-INF/MANIFEST.MF
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/MaemoCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/SimpleCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/AddSbrshCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/ConfigureSbrshCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/MountTargetSbrshCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/UnmountTargetSbrshCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/ScratchboxSDK.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/command/AbstractSDKCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/command/ScratchboxCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/AbstractScratchboxSDK.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/AbstractScratchboxSDKTarget.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/IScratchboxSDK.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/IScratchboxSDKTarget.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/MachineUtils.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/MaemoUtils.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/AbstractSB1Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/CreateTargetCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/GetCurrentTargetCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/GetGdbQemuCommandPatternCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/GetVersionScratchboxCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/KillallCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListCompilersCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListCputranspCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListDevkitsCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListSessionsCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListTargetsCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/RemoveTargetCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ResetTargetCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/RootstrapCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/SelectTargetCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ShowTargetCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/core/Scratchbox1SDK.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/AbstractSb2Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/CreateMaemoRootstrapSb2Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/CreateTargetSb2Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetCurrentTargetSb2Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetGdbQemuCommandPatternCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetMaemoRootstrapLocationCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetVersionScratchboxCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListAvailableMaemoRootstrapsSb2Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListCompilersSb2Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListCputranspSb2Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListInstalledMaemoRootstrapsSb2Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListTargetsCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/MaemoRootstrapSb2Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/RemoveMaemoRootstrapSb2Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/RemoveTargetSb2Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ShowPathMappingSb2Command.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/core/Scratchbox2FileSystemMapping.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/core/Scratchbox2SDK.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/BaseTest.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/MockCommandAbstractor.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestCreateTargetCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestListSb2Commands.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestScratchboxCommand.java
   branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/adapters/MaemoScratchboxSDKManageTargetAdapterBase.java
Log:
fixes

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/META-INF/MANIFEST.MF
===================================================================

--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/META-INF/MANIFEST.MF	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/META-INF/MANIFEST.MF	2008-10-14 09:11:49 UTC (rev 870)
@@ -14,7 +14,8 @@
  org.maemo.esbox.linux.packages.core;bundle-version="1.5.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: org.maemo.esbox.internal.maemosdk.core;x-friends:="org.maemo.esbox.maemosdk.tests",
+Export-Package: org.maemo.esbox.internal.api.commands;x-friends:="org.maemo.esbox.maemosdk.sb1,org.maemo.esbox.maemosdk.sb2,org.maemo.esbox.maemosdk.tests",
+ org.maemo.esbox.internal.maemosdk.core;x-friends:="org.maemo.esbox.maemosdk.tests",
  org.maemo.esbox.internal.maemosdk.core.adapters;x-friends:="org.maemo.esbox.maemosdk.tests",
  org.maemo.esbox.internal.maemosdk.core.command;x-friends:="org.maemo.esbox.maemosdk.tests",
  org.maemo.esbox.internal.maemosdk.core.command.scratchbox;x-friends:="org.maemo.esbox.maemosdk.tests",

Added: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/commands/ICommandAbstractor.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/commands/ICommandAbstractor.java	                        (rev 0)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/commands/ICommandAbstractor.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.maemo.esbox.internal.api.commands;
+
+import org.maemo.esbox.core.machine.IFileSystemAccess;
+import org.maemo.esbox.core.process.IProcessLauncherFactory;
+
+/**
+ * This interface is used to abstract the way an ICommand is constructed and
+ * launched, and the means by which it gets the values to substitute into
+ * commands. It may, for instance, either be run in the context of an
+ * ISDKTarget, ISDK, or run natively. Similarly, it may be controlled entirely
+ * by unit tests.
+ * 
+ * @author eswartz
+ * 
+ */
+public interface ICommandAbstractor {
+
+	/**
+	 * Read a preference for the implicit category of the abstractor.
+	 * 
+	 * @param key
+	 *            the key to search
+	 * @return preference value or "" if undefined
+	 */
+	String getPreferenceValue(String key);
+
+	/**
+	 * Get the factory for creating process launchers to run programs in the
+	 * context of the SDK.
+	 * 
+	 * @return the process launcher factory, never <code>null</code>
+	 */
+	IProcessLauncherFactory getProcessLauncherFactory();
+
+	/**
+	 * Get the file system access for the filesystem used by the command
+	 * 
+	 * @return IFilesystemAccess, never <code>null</code>
+	 */
+	IFileSystemAccess getFileSystemAccess();
+}
\ No newline at end of file

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/MaemoCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/MaemoCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/MaemoCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -18,10 +18,10 @@
 import org.maemo.esbox.core.env.IEnvironmentModifierBlock;
 import org.maemo.esbox.core.process.*;
 import org.maemo.esbox.core.sdk.ISDKTarget;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.internal.maemosdk.core.Activator;
 import org.maemo.esbox.internal.maemosdk.core.MaemoEnvironmentUtils;
 import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/SimpleCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/SimpleCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/SimpleCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -14,7 +14,7 @@
 import org.maemo.esbox.core.*;
 import org.maemo.esbox.core.process.IProcessLauncher;
 import org.maemo.esbox.core.process.ProcessLauncherCreator;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/AddSbrshCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/AddSbrshCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/AddSbrshCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -12,8 +12,8 @@
 package org.maemo.esbox.internal.maemosdk.core.command.scratchbox.sbrsh;
 
 import org.maemo.esbox.core.ESboxException;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/ConfigureSbrshCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/ConfigureSbrshCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/ConfigureSbrshCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -12,8 +12,8 @@
 package org.maemo.esbox.internal.maemosdk.core.command.scratchbox.sbrsh;
 
 import org.maemo.esbox.core.ESboxException;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/MountTargetSbrshCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/MountTargetSbrshCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/MountTargetSbrshCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -12,8 +12,8 @@
 package org.maemo.esbox.internal.maemosdk.core.command.scratchbox.sbrsh;
 
 import org.maemo.esbox.core.ESboxException;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/UnmountTargetSbrshCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/UnmountTargetSbrshCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/UnmountTargetSbrshCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -12,8 +12,8 @@
 package org.maemo.esbox.internal.maemosdk.core.command.scratchbox.sbrsh;
 
 import org.maemo.esbox.core.ESboxException;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/ScratchboxSDK.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/ScratchboxSDK.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/ScratchboxSDK.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -17,8 +17,8 @@
 import org.maemo.esbox.core.machine.ILocalMachine;
 import org.maemo.esbox.core.machine.IMachine;
 import org.maemo.esbox.core.sdk.IPreferenceProvider;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.internal.api.core.sdk.BaseSDK;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDK;
 import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDKTarget;
 

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/command/AbstractSDKCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/command/AbstractSDKCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/command/AbstractSDKCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -2,6 +2,8 @@
 
 import java.security.InvalidParameterException;
 
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
+
 public abstract class AbstractSDKCommand extends ScratchboxCommand {
 
 	public AbstractSDKCommand(ICommandAbstractor commandAbstractor) {

Deleted: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/command/ICommandAbstractor.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/command/ICommandAbstractor.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/command/ICommandAbstractor.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-package org.maemo.esbox.maemosdk.core.command;
-
-import org.maemo.esbox.core.machine.IFileSystemAccess;
-import org.maemo.esbox.core.process.IProcessLauncherFactory;
-
-/**
- * This interface is used to abstract the way an ICommand is constructed and
- * launched, and the means by which it gets the values to substitute into
- * commands. It may, for instance, either be run in the context of an
- * ISDKTarget, ISDK, or run natively. Similarly, it may be controlled entirely
- * by unit tests.
- * 
- * @author eswartz
- * 
- */
-public interface ICommandAbstractor {
-
-	/**
-	 * Read a preference for the implicit category of the abstractor.
-	 * 
-	 * @param key
-	 *            the key to search
-	 * @return preference value or "" if undefined
-	 */
-	String getPreferenceValue(String key);
-
-	/**
-	 * Get the factory for creating process launchers to run programs in the
-	 * context of the SDK.
-	 * 
-	 * @return the process launcher factory, never <code>null</code>
-	 */
-	IProcessLauncherFactory getProcessLauncherFactory();
-
-	/**
-	 * Get the file system access for the filesystem used by the command
-	 * 
-	 * @return IFilesystemAccess, never <code>null</code>
-	 */
-	IFileSystemAccess getFileSystemAccess();
-}
\ No newline at end of file

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/command/ScratchboxCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/command/ScratchboxCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/command/ScratchboxCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -17,6 +17,7 @@
 import org.maemo.esbox.core.*;
 import org.maemo.esbox.core.env.IEnvironmentModifierBlock;
 import org.maemo.esbox.core.process.*;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.internal.maemosdk.core.Activator;
 import org.maemo.esbox.internal.maemosdk.core.command.ICommand;
 import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ScratchboxInvalidOperationException;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/AbstractScratchboxSDK.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/AbstractScratchboxSDK.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/AbstractScratchboxSDK.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -25,6 +25,7 @@
 import org.maemo.esbox.core.process.IProcessLauncherFactory;
 import org.maemo.esbox.core.process.ProcessLauncherUtils;
 import org.maemo.esbox.core.sdk.IPreferenceProvider;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.internal.api.core.machine.HostUnixMachine;
 import org.maemo.esbox.internal.api.core.sdk.BaseSDK;
 import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.sbrsh.AddSbrshCommand;
@@ -32,7 +33,6 @@
 import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.sbrsh.MountTargetSbrshCommand;
 import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.sbrsh.UnmountTargetSbrshCommand;
 import org.maemo.esbox.internal.maemosdk.core.sdk.IScratchboxSDKPlatformArchitectureProvider;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 
 public abstract class AbstractScratchboxSDK extends BaseSDK implements
 		IScratchboxSDK, IScratchboxSDKPlatformArchitectureProvider {

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/AbstractScratchboxSDKTarget.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/AbstractScratchboxSDKTarget.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/AbstractScratchboxSDKTarget.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -17,9 +17,9 @@
 import org.maemo.esbox.core.sdk.ISDK;
 import org.maemo.esbox.core.sdk.ISDKPlatform;
 import org.maemo.esbox.core.sdk.ISDKTarget;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.internal.api.core.sdk.BaseSDKTarget;
 import org.maemo.esbox.internal.maemosdk.core.adapters.MaemoRunStandaloneSupportAdapterFactory;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 
 /**
  * @author baranov

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/IScratchboxSDK.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/IScratchboxSDK.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/IScratchboxSDK.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 
 import org.maemo.esbox.core.ESboxException;
 import org.maemo.esbox.core.sdk.ISDK;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 
 /**
  * This interface provides scratchbox-specific functionality to an ISDK

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/IScratchboxSDKTarget.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/IScratchboxSDKTarget.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/IScratchboxSDKTarget.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import org.maemo.esbox.core.ESboxException;
 import org.maemo.esbox.core.process.IProcessLauncherFactory;
 import org.maemo.esbox.core.sdk.ISDKTarget;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 
 /**
  * This interface provides scratchbox-specific functionality to an ISDKTarget.

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/MachineUtils.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/MachineUtils.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/MachineUtils.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -22,9 +22,9 @@
 import org.maemo.esbox.core.machine.IMachine;
 import org.maemo.esbox.core.machine.MachineManager;
 import org.maemo.esbox.core.process.IProcessLauncherFactory;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.internal.api.core.sdk.UserAwarePreferenceProviderWrapper;
 import org.maemo.esbox.internal.maemosdk.core.Activator;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 
 /**
  * @author baranov

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/MaemoUtils.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/MaemoUtils.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/MaemoUtils.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -14,8 +14,8 @@
 import org.maemo.esbox.core.machine.IFileSystemAccess;
 import org.maemo.esbox.core.process.IProcessLauncherFactory;
 import org.maemo.esbox.core.sdk.ISDKTarget;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.MaemoCommand;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 
 /**
  * @author baranov

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/AbstractSB1Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/AbstractSB1Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/AbstractSB1Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -12,8 +12,8 @@
 
 import java.security.InvalidParameterException;
 
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.AbstractSDKCommand;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;
 
 /**

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/CreateTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/CreateTargetCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/CreateTargetCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.sb1.core.IScratchbox1SDK;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/GetCurrentTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/GetCurrentTargetCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/GetCurrentTargetCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb1.core.IScratchbox1SDK;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/GetGdbQemuCommandPatternCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/GetGdbQemuCommandPatternCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/GetGdbQemuCommandPatternCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -17,13 +17,12 @@
 
 import org.eclipse.core.runtime.IStatus;
 import org.maemo.esbox.core.ESboxException;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDKTarget;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;
-import org.maemo.esbox.maemosdk.sb1.core.Scratchbox1SDKTarget;
 import org.maemo.esbox.maemosdk.sb1.internal.Activator;
 import org.osgi.framework.Version;
 
@@ -35,9 +34,9 @@
  */
 public class GetGdbQemuCommandPatternCommand extends AbstractSB1Command {
 
-	private Scratchbox1SDKTarget sdkTarget;
+	private IScratchboxSDKTarget sdkTarget;
 
-	public GetGdbQemuCommandPatternCommand(Scratchbox1SDKTarget sdkTarget,
+	public GetGdbQemuCommandPatternCommand(IScratchboxSDKTarget sdkTarget,
 			ICommandAbstractor commandAbstractor) {
 		super(commandAbstractor);
 		this.sdkTarget = sdkTarget;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/GetVersionScratchboxCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/GetVersionScratchboxCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/GetVersionScratchboxCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/KillallCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/KillallCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/KillallCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -14,7 +14,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListCompilersCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListCompilersCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListCompilersCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListCputranspCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListCputranspCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListCputranspCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListDevkitsCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListDevkitsCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListDevkitsCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListSessionsCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListSessionsCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListSessionsCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -16,7 +16,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListTargetsCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListTargetsCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ListTargetsCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/RemoveTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/RemoveTargetCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/RemoveTargetCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -17,7 +17,7 @@
 
 import org.maemo.esbox.core.ESboxException;
 import org.maemo.esbox.core.sdk.ISDK;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ResetTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ResetTargetCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ResetTargetCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/RootstrapCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/RootstrapCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/RootstrapCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/SelectTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/SelectTargetCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/SelectTargetCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDK;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ShowTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ShowTargetCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/command/ShowTargetCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -17,7 +17,7 @@
 import java.util.StringTokenizer;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxTarget;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/core/Scratchbox1SDK.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/core/Scratchbox1SDK.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/core/Scratchbox1SDK.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -21,10 +21,10 @@
 import org.maemo.esbox.core.sdk.IPreferenceProvider;
 import org.maemo.esbox.core.sdk.ISDKPlatform;
 import org.maemo.esbox.core.sdk.ISDKTarget;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.internal.api.core.sdk.BaseSDKPlatform;
 import org.maemo.esbox.maemosdk.core.MaemoSDKEngine;
 import org.maemo.esbox.maemosdk.core.MaemoSDKInfo;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.sdk.AbstractScratchboxSDK;
 import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDKTarget;
 import org.maemo.esbox.maemosdk.core.sdk.MachineUtils;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd1/src/org/maemo/esbox/maemosdk/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -66,11 +66,7 @@
 		return Policy.getCancelStatus(Activator.getDefault());
 	}
 
-	public IStatus removeSDKTarget(Shell shell, ISDKTarget selectedTarget) {
-
-		return null;
-	}
-
+	
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -91,4 +87,11 @@
 		};
 	}
 
+	@Override
+	protected boolean isRootStrapUsed(ISDKTarget selectedTarget) {
+		return false;
+	}
+	
+	
+
 }

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/AbstractSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/AbstractSb2Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/AbstractSb2Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -12,8 +12,8 @@
 
 import java.security.InvalidParameterException;
 
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.AbstractSDKCommand;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.sb2.core.SB2PreferenceConstants;
 
 public abstract class AbstractSb2Command extends AbstractSDKCommand {

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/CreateMaemoRootstrapSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/CreateMaemoRootstrapSb2Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/CreateMaemoRootstrapSb2Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -19,7 +19,7 @@
 import org.maemo.esbox.core.env.IEnvironmentModifierBlock;
 import org.maemo.esbox.core.process.ProcessLauncherUtils;
 import org.maemo.esbox.core.sdk.ISDK;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb2.core.SB2PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/CreateTargetSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/CreateTargetSb2Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/CreateTargetSb2Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -19,7 +19,7 @@
 import org.maemo.esbox.core.process.ProcessLauncherCreator;
 import org.maemo.esbox.core.process.ShellTemplateSubstitutor;
 import org.maemo.esbox.core.sdk.ISDK;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.sb2.core.SB2PreferenceConstants;
 import org.maemo.esbox.maemosdk.sb2.internal.Activator;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetCurrentTargetSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetCurrentTargetSb2Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetCurrentTargetSb2Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -27,7 +27,7 @@
 import org.maemo.esbox.core.CorePreferenceConstants;
 import org.maemo.esbox.core.ESboxException;
 import org.maemo.esbox.core.Policy;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetGdbQemuCommandPatternCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetGdbQemuCommandPatternCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetGdbQemuCommandPatternCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -14,13 +14,12 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDKTarget;
 import org.maemo.esbox.maemosdk.sb2.core.SB2PreferenceConstants;
-import org.maemo.esbox.maemosdk.sb2.core.Scratchbox2SDKTarget;
 
 /**
  * Get the command pattern for launching qemu with the debugger
@@ -29,9 +28,9 @@
  * 
  */
 public class GetGdbQemuCommandPatternCommand extends AbstractSb2Command {
-	private Scratchbox2SDKTarget sdkTarget;
+	private IScratchboxSDKTarget sdkTarget;
 
-	public GetGdbQemuCommandPatternCommand(Scratchbox2SDKTarget sdkTarget,
+	public GetGdbQemuCommandPatternCommand(IScratchboxSDKTarget sdkTarget,
 			ICommandAbstractor commandAbstractor) {
 		super(commandAbstractor);
 		this.sdkTarget = sdkTarget;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetMaemoRootstrapLocationCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetMaemoRootstrapLocationCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetMaemoRootstrapLocationCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -19,11 +19,11 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
+import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDKTarget;
 import org.maemo.esbox.maemosdk.sb2.core.SB2PreferenceConstants;
-import org.maemo.esbox.maemosdk.sb2.core.Scratchbox2SDKTarget;
 
 /**
  * @author eswartz
@@ -31,10 +31,10 @@
  */
 public class GetMaemoRootstrapLocationCommand extends MaemoRootstrapSb2Command {
 
-	private Scratchbox2SDKTarget sdkTarget;
+	private IScratchboxSDKTarget sdkTarget;
 
 	public GetMaemoRootstrapLocationCommand(
-			ICommandAbstractor commandAbstractor, Scratchbox2SDKTarget sdkTarget) {
+			ICommandAbstractor commandAbstractor, IScratchboxSDKTarget sdkTarget) {
 		super(commandAbstractor);
 		this.sdkTarget = sdkTarget;
 	}

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetVersionScratchboxCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetVersionScratchboxCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/GetVersionScratchboxCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb2.core.SB2PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListAvailableMaemoRootstrapsSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListAvailableMaemoRootstrapsSb2Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListAvailableMaemoRootstrapsSb2Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -18,7 +18,7 @@
 import org.maemo.esbox.core.ESboxException;
 import org.maemo.esbox.core.env.IEnvironmentModifierBlock;
 import org.maemo.esbox.core.process.ProcessLauncherUtils;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.MaemoRootstrap;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListCompilersSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListCompilersSb2Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListCompilersSb2Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -19,7 +19,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Path;
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb2.internal.Activator;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListCputranspSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListCputranspSb2Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListCputranspSb2Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -21,7 +21,7 @@
 import org.eclipse.core.runtime.Path;
 import org.maemo.esbox.core.ESboxException;
 import org.maemo.esbox.core.process.ProcessLauncherUtils;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListInstalledMaemoRootstrapsSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListInstalledMaemoRootstrapsSb2Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListInstalledMaemoRootstrapsSb2Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb2.core.SB2PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListTargetsCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListTargetsCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ListTargetsCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb2.core.SB2PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/MaemoRootstrapSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/MaemoRootstrapSb2Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/MaemoRootstrapSb2Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -18,7 +18,7 @@
 import org.maemo.esbox.core.env.IEnvironmentModifierBlock;
 import org.maemo.esbox.core.process.CommandLineArguments;
 import org.maemo.esbox.core.process.ShellTemplateSubstitutor;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb2.core.SB2PreferenceConstants;
 

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/RemoveMaemoRootstrapSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/RemoveMaemoRootstrapSb2Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/RemoveMaemoRootstrapSb2Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -19,7 +19,7 @@
 import org.maemo.esbox.core.ESboxException;
 import org.maemo.esbox.core.env.IEnvironmentModifierBlock;
 import org.maemo.esbox.core.process.ProcessLauncherUtils;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb2.core.SB2PreferenceConstants;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/RemoveTargetSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/RemoveTargetSb2Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/RemoveTargetSb2Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -19,7 +19,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.maemo.esbox.core.ESboxException;
 import org.maemo.esbox.core.sdk.ISDK;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxInvalidParameterException;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb2.core.Scratchbox2SDK;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ShowPathMappingSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ShowPathMappingSb2Command.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/command/ShowPathMappingSb2Command.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -25,7 +25,7 @@
 import org.maemo.esbox.core.process.CommandLineArguments;
 import org.maemo.esbox.core.process.IProcessLauncher;
 import org.maemo.esbox.core.process.ProcessLauncherCreator;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
 import org.maemo.esbox.maemosdk.sb2.core.SB2PreferenceConstants;
 

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/core/Scratchbox2FileSystemMapping.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/core/Scratchbox2FileSystemMapping.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/core/Scratchbox2FileSystemMapping.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -12,6 +12,7 @@
 import org.maemo.esbox.core.ESboxException;
 import org.maemo.esbox.internal.api.core.machine.FileSystemMapping;
 import org.maemo.esbox.internal.api.core.machine.IFileSystemMappingImpl;
+import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDKTarget;
 import org.maemo.esbox.maemosdk.sb2.internal.Activator;
 
 import com.nokia.cpp.internal.api.utils.core.Pair;
@@ -32,7 +33,7 @@
 	 * @param targetRoot
 	 * @param target
 	 */
-	public Scratchbox2FileSystemMapping(Scratchbox2SDKTarget sdkTarget,
+	public Scratchbox2FileSystemMapping(IScratchboxSDKTarget sdkTarget,
 			IPath scratchboxBase, String target, String user) {
 
 		super(FileSystemMapping.getMachineCanonicalizer(true),

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/core/Scratchbox2SDK.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/core/Scratchbox2SDK.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/core/Scratchbox2SDK.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -27,8 +27,8 @@
 import org.maemo.esbox.core.sdk.IPreferenceProvider;
 import org.maemo.esbox.core.sdk.ISDKPlatform;
 import org.maemo.esbox.core.sdk.ISDKTarget;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.internal.api.core.sdk.BaseSDKPlatform;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.scratchbox.MaemoRootstrap;
 import org.maemo.esbox.maemosdk.core.sdk.AbstractScratchboxSDK;
 import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDKTarget;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sd2/src/org/maemo/esbox/maemosdk/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -12,7 +12,6 @@
 
 package org.maemo.esbox.maemosdk.sb2.ui.adapters;
 
-import java.text.MessageFormat;
 import java.util.List;
 
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -20,17 +19,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.maemo.esbox.core.ESboxException;
 import org.maemo.esbox.core.Policy;
@@ -80,88 +69,6 @@
 		return Policy.getCancelStatus(Activator.getDefault());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.maemo.esbox.core.adapters.ISDKTargetInstallerAdapter#removeSDKTarget
-	 * (org.eclipse.swt.widgets.Shell, org.maemo.esbox.core.sdk.ISDKTarget)
-	 */
-	public IStatus removeSDKTarget(Shell shell, ISDKTarget selectedTarget) {
-		final boolean[] deleteRootstrap = { false };
-		boolean rootstrapUsed_ = false;
-		try {
-			// see if a rootstrap -- possibly disconnected from the target --
-			// exists
-			List<MaemoRootstrap> rootstraps = sdk
-					.getAvailableMaemoRootstraps(selectedTarget.getSDK()
-							.getMachine());
-			for (MaemoRootstrap rootstrap : rootstraps) {
-				if (rootstrap.getName().equals(selectedTarget.getName())) {
-					rootstrapUsed_ = true;
-					break;
-				}
-			}
-		} catch (ESboxException e1) {
-			Activator.getErrorLogger().logError(
-					"Failure scanning maemo rootstraps", e1);
-		}
-
-		final boolean rootstrapUsed = rootstrapUsed_;
-		String message;
-		if (rootstrapUsed) {
-			message = "Really delete SDK target ''{0}''?\n\n"
-					+ "This will remove the entry from {1}.\n\n"
-					+ "If existing projects use this target, you will be asked to select an alternate target.";
-		} else {
-			message = "Really delete SDK target ''{0}''?\n\n"
-					+ "This will remove the entry from {1} and delete the rootstrap.\n\n"
-					+ "If existing projects use this target, you will be asked to select an alternate target.";
-		}
-		String title = MessageFormat.format("Delete target from {0}?",
-				selectedTarget.getSDK().getDisplayName());
-
-		MessageDialog dialog = new MessageDialog(shell, title, null,
-				MessageFormat.format(message, selectedTarget.getName(),
-						selectedTarget.getSDK().getName()),
-				MessageDialog.WARNING,
-				new String[] { IDialogConstants.YES_LABEL,
-						IDialogConstants.NO_LABEL }, 1) {
-			@Override
-			protected Control createDialogArea(Composite parent) {
-				Composite composite = (Composite) super
-						.createDialogArea(parent);
-				if (rootstrapUsed) {
-					Label spacer = new Label(composite, SWT.NONE);
-					spacer.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true,
-							false));
-
-					final Button removeRootstrap = new Button(composite,
-							SWT.CHECK);
-					removeRootstrap
-							.setText("Also delete rootstrap (target filesystem)");
-					removeRootstrap.setLayoutData(new GridData(SWT.FILL,
-							SWT.TOP, true, false));
-					removeRootstrap
-							.addSelectionListener(new SelectionAdapter() {
-								@Override
-								public void widgetSelected(SelectionEvent e) {
-									deleteRootstrap[0] = removeRootstrap
-											.getSelection();
-								}
-							});
-				}
-				return composite;
-			}
-		};
-
-		if (dialog.open() == 0) {
-			return removeTarget(shell, selectedTarget, deleteRootstrap[0]);
-		} else {
-			return Policy.getCancelStatus(Activator.getDefault());
-		}
-	}
-
 	protected ESboxTargetRemover createTargetRemover(Shell shell,
 			ISDKTarget target, boolean deleteRootstrap) {
 		return new ESboxTargetRemover(shell, target, deleteRootstrap) {
@@ -182,4 +89,30 @@
 		};
 	}
 
+	@Override
+	protected boolean isRootStrapUsed(ISDKTarget selectedTarget) {
+		{
+			boolean rootstrapUsed_ = false;
+			try {
+				// see if a rootstrap -- possibly disconnected from the target --
+				// exists
+				List<MaemoRootstrap> rootstraps = sdk
+						.getAvailableMaemoRootstraps(selectedTarget.getSDK()
+								.getMachine());
+				for (MaemoRootstrap rootstrap : rootstraps) {
+					if (rootstrap.getName().equals(selectedTarget.getName())) {
+						rootstrapUsed_ = true;
+						break;
+					}
+				}
+			} catch (ESboxException e1) {
+				Activator.getErrorLogger().logError(
+						"Failure scanning maemo rootstraps", e1);
+			}
+			return rootstrapUsed_;
+		}
+	}
+	
+	
+
 }

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/BaseTest.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/BaseTest.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/BaseTest.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -14,7 +14,7 @@
 
 import org.junit.Before;
 import org.maemo.esbox.core.sdk.ISDKTarget;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDKTarget;
 import org.maemo.esbox.maemosdk.core.sdk.MaemoUtils;
 import org.maemo.esbox.maemosdk.core.sdk.ScratchboxSDKFacade;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/MockCommandAbstractor.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/MockCommandAbstractor.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/MockCommandAbstractor.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -17,7 +17,7 @@
 import org.maemo.esbox.core.process.HostProcessLauncherFactory;
 import org.maemo.esbox.core.process.IProcessLauncherFactory;
 import org.maemo.esbox.core.sdk.ISDKTarget;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.sb2.core.SB2PreferenceConstants;
 import org.maemo.esbox.maemosdk.sb2.launcher.Scratchbox2ProcessLauncherFactory;
 

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestCreateTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestCreateTargetCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestCreateTargetCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -15,8 +15,7 @@
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.core.sdk.ISDK;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
 import org.maemo.esbox.maemosdk.sb1.command.CreateTargetCommand;
 import org.maemo.esbox.maemosdk.sb1.command.ListTargetsCommand;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestListSb2Commands.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestListSb2Commands.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestListSb2Commands.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -24,7 +24,7 @@
 import org.maemo.esbox.core.machine.IFileSystemAccess;
 import org.maemo.esbox.core.process.IProcessLauncher;
 import org.maemo.esbox.core.process.IProcessLauncherFactory;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.core.scratchbox.MaemoRootstrap;
 import org.maemo.esbox.maemosdk.sb2.command.ListAvailableMaemoRootstrapsSb2Command;
 import org.maemo.esbox.maemosdk.sb2.command.ListCompilersSb2Command;

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestScratchboxCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestScratchboxCommand.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestScratchboxCommand.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -11,13 +11,10 @@
  *******************************************************************************/
 package org.maemo.esbox.maemosdk.tests.commands;
 
-import java.security.InvalidParameterException;
 import java.util.List;
 
 import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.maemosdk.core.command.AbstractSDKCommand;
-import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
-import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
+import org.maemo.esbox.internal.api.commands.ICommandAbstractor;
 import org.maemo.esbox.maemosdk.sb1.command.AbstractSB1Command;
 import org.maemo.esbox.maemosdk.sb1.core.SB1PreferenceConstants;
 

Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/adapters/MaemoScratchboxSDKManageTargetAdapterBase.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/adapters/MaemoScratchboxSDKManageTargetAdapterBase.java	2008-10-14 07:13:50 UTC (rev 869)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/adapters/MaemoScratchboxSDKManageTargetAdapterBase.java	2008-10-14 09:11:49 UTC (rev 870)
@@ -37,7 +37,6 @@
 import org.maemo.esbox.core.sdk.ISDKTarget;
 import org.maemo.esbox.internal.maemosdk.ui.UIActivator;
 import org.maemo.esbox.maemosdk.core.scratchbox.MaemoRootstrap;
-import org.maemo.esbox.maemosdk.core.sdk.AbstractScratchboxSDK;
 import org.maemo.esbox.maemosdk.core.sdk.CacheUtils;
 
 /**
@@ -56,6 +55,78 @@
 		CacheUtils.getInstance().clearCachedData();
 	}
 	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.maemo.esbox.core.adapters.ISDKTargetInstallerAdapter#removeSDKTarget
+	 * (org.eclipse.swt.widgets.Shell, org.maemo.esbox.core.sdk.ISDKTarget)
+	 */
+	public IStatus removeSDKTarget(Shell shell, ISDKTarget selectedTarget) {
+		final boolean[] deleteRootstrap = { false };
+		boolean rootstrapUsed_ = isRootStrapUsed(selectedTarget);
+
+		final boolean rootstrapUsed = rootstrapUsed_;
+		
+		String message;
+		if (rootstrapUsed) {
+			message = "Really delete SDK target ''{0}''?\n\n"
+					+ "This will remove the entry from {1}.\n\n"
+					+ "If existing projects use this target, you will be asked to select an alternate target.";
+		} else {
+			message = "Really delete SDK target ''{0}''?\n\n"
+					+ "This will remove the entry from {1} and delete the rootstrap.\n\n"
+					+ "If existing projects use this target, you will be asked to select an alternate target.";
+		}
+		String title = MessageFormat.format("Delete target from {0}?",
+				selectedTarget.getSDK().getDisplayName());
+
+		MessageDialog dialog = new MessageDialog(shell, title, null,
+				MessageFormat.format(message, selectedTarget.getName(),
+						selectedTarget.getSDK().getName()),
+				MessageDialog.WARNING,
+				new String[] { IDialogConstants.YES_LABEL,
+						IDialogConstants.NO_LABEL }, 1) {
+			@Override
+			protected Control createDialogArea(Composite parent) {
+				Composite composite = (Composite) super
+						.createDialogArea(parent);
+				if (rootstrapUsed) {
+					Label spacer = new Label(composite, SWT.NONE);
+					spacer.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true,
+							false));
+
+					final Button removeRootstrap = new Button(composite,
+							SWT.CHECK);
+					removeRootstrap
+							.setText("Also delete rootstrap (target filesystem)");
+					removeRootstrap.setLayoutData(new GridData(SWT.FILL,
+							SWT.TOP, true, false));
+					removeRootstrap
+							.addSelectionListener(new SelectionAdapter() {
+								@Override
+								public void widgetSelected(SelectionEvent e) {
+									deleteRootstrap[0] = removeRootstrap
+											.getSelection();
+								}
+							});
+				}
+				return composite;
+			}
+		};
+
+		if (dialog.open() == 0) {
+			return removeTarget(shell, selectedTarget, deleteRootstrap[0]);
+		} else {
+			return Policy.getCancelStatus(UIActivator.getDefault());
+		}
+	}
+
+	/**
+	 * @param selectedTarget
+	 * @return
+	 */
+	protected abstract boolean isRootStrapUsed(ISDKTarget selectedTarget);
 	
 	protected IStatus removeTarget(final Shell shell, final ISDKTarget selectedTarget, final boolean deleteRootstrap) {
 		ProgressMonitorDialog dialog = new ProgressMonitorDialog(shell);

