Tue Nov 18 17:52:15 EET 2008

Author: eswartz
Date: 2008-11-18 17:52:14 +0200 (Tue, 18 Nov 2008)
New Revision: 950

Modified:
   branches/sdkPlusSupport/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/IMaemoLauncherAdapter.java
   branches/sdkPlusSupport/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java
   branches/sdkPlusSupport/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseTest.java
   branches/sdkPlusSupport/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestRemoveSb2Command.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDK.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk/IScratchboxSDK.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/Activator.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/AbstractSb2Command.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/MaemoRootstrapCommand.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/MaemoSdkCommand.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDKTarget.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Sb2MaemoLauncherAdapter.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncherFactory.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences/Scratchbox2PreferencesPage.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/MaemoRootstrapContentLabelProvider.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/TargetWizardRootstrapSb2Page.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk/IScratchbox2SDK.java
Log:
Fix some issues in preparation for a new branch.
-- remove unused imports
-- add missing file header and javadoc
-- use #getProcessLauncherFactory in MaemoScriptLauncher (since this is used for build commands)

Modified: branches/sdkPlusSupport/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/IMaemoLauncherAdapter.java
===================================================================

--- branches/sdkPlusSupport/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/IMaemoLauncherAdapter.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/IMaemoLauncherAdapter.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -1,8 +1,24 @@
+/*******************************************************************************
+ * 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:
+ *    Petr Baranov (Nokia) - initial API and implementation
+ *    Ed Swartz (Nokia)
+ *******************************************************************************/
 package org.maemo.esbox.internal.api.maemosdk.core.tools;
 
 import org.maemo.mica.common.core.MicaException;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
 
+/**
+ * This adapter on ISDKTarget allows an SDK target to control how the maemo emulation 
+ * environment is controlled. 
+ * @author baranov
+ *
+ */
 public interface IMaemoLauncherAdapter {
 
 	/**

Modified: branches/sdkPlusSupport/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -418,8 +418,7 @@
 				project);
 		IPath wdInScratchbox = sdkTarget.convertHostToTargetPath(wd);
 
-		IProcessLauncherFactory launcherFactory = sdkTarget
-				.getMaemoLauncherFactory();
+		IProcessLauncherFactory launcherFactory = sdkTarget.getProcessLauncherFactory();
 
 		final IProcessLauncher processLauncher = ProcessLauncherCreator
 				.createProcessLauncher(launcherFactory, wdInScratchbox,

Modified: branches/sdkPlusSupport/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseTest.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseTest.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseTest.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -12,8 +12,6 @@
 
 import org.junit.Before;
 import org.maemo.esbox.internal.scratchbox.sb1.core.Scratchbox1SDK;
-import org.maemo.esbox.internal.scratchbox.sb2.command.MaemoRootstrapCommand;
-import org.maemo.esbox.internal.scratchbox.sb2.command.MaemoSdkCommand;
 import org.maemo.esbox.internal.scratchbox.sb2.core.Scratchbox2SDK;
 import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
 import org.maemo.esbox.scratchbox.core.sdk.ScratchboxSDKFacade;

Modified: branches/sdkPlusSupport/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestRemoveSb2Command.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestRemoveSb2Command.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestRemoveSb2Command.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -11,7 +11,6 @@
 package org.maemo.esbox.scratchbox.tests.commands;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.maemo.esbox.internal.api.scratchbox.core.sdk.CacheUtils;
@@ -62,7 +61,6 @@
 		}
 		
 		if (targets.contains(TARGET)) {
-			List<String> param = Collections.singletonList(TARGET);
 			try {
 				CacheUtils.getInstance().clearCachedData();
 				maemoRootstrapCommand.remove(TARGET);

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDK.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDK.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDK.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -29,7 +29,7 @@
 import org.maemo.mica.internal.api.common.core.sdk.BaseSDK;
 
 public abstract class AbstractScratchboxSDK extends BaseSDK implements
-		IScratchboxSDK, IScratchboxSDKPlatformArchitectureProvider {
+		IScratchboxSDK {
 
 	protected IPreferenceProvider prefProvider = null;
 

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk/IScratchboxSDK.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk/IScratchboxSDK.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk/IScratchboxSDK.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -13,6 +13,7 @@
 
 import java.util.List;
 
+import org.maemo.esbox.internal.api.scratchbox.core.sdk.IScratchboxSDKPlatformArchitectureProvider;
 import org.maemo.mica.common.core.MicaException;
 import org.maemo.mica.common.core.sdk.ISDK;
 
@@ -22,7 +23,7 @@
  * @author baranov
  * 
  */
-public interface IScratchboxSDK extends ISDK {
+public interface IScratchboxSDK extends ISDK, IScratchboxSDKPlatformArchitectureProvider {
 	/**
 	 * If appropriate, get the cached value of the scratchbox target.
 	 * 

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/Activator.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/Activator.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/Activator.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -1,35 +1,18 @@
 package org.maemo.esbox.internal.scratchbox.sb2;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.net.ssl.HostnameVerifier;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.*;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
-import org.maemo.esbox.internal.scratchbox.sb2.command.AbstractSb2Command;
 import org.maemo.esbox.scratchbox.sb2.sdk.IScratchbox2SDKTarget;
 import org.maemo.mica.common.core.ErrorLogger;
-import org.maemo.mica.common.core.MicaException;
-import org.maemo.mica.common.core.process.HostProcessLauncherFactory;
-import org.maemo.mica.common.core.process.ProcessLauncherUtils;
 import org.osgi.framework.BundleContext;
 
+import java.io.*;
+
 /**
  * The activator class controls the plug-in life cycle
  */

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/AbstractSb2Command.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/AbstractSb2Command.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/AbstractSb2Command.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -14,17 +14,12 @@
 import org.maemo.esbox.internal.api.scratchbox.sb2.core.SB2PreferenceConstants;
 import org.maemo.esbox.scratchbox.core.command.AbstractSDKCommand;
 import org.maemo.mica.common.core.MicaException;
-import org.maemo.mica.common.core.process.HostProcessLauncherFactory;
-import org.maemo.mica.common.core.process.IProcessLauncher;
-import org.maemo.mica.common.core.process.IProcessLauncherFactory;
-import org.maemo.mica.common.core.process.ProcessLauncherUtils;
+import org.maemo.mica.common.core.process.*;
 import org.maemo.mica.common.core.process.ProcessLauncherUtils.Results;
 import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
 
 import java.security.InvalidParameterException;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 public abstract class AbstractSb2Command extends AbstractSDKCommand {

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/MaemoRootstrapCommand.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/MaemoRootstrapCommand.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/MaemoRootstrapCommand.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -10,17 +10,14 @@
  *******************************************************************************/
 package org.maemo.esbox.internal.scratchbox.sb2.command;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.maemo.mica.common.core.MicaException;
 import org.maemo.mica.common.core.process.IProcessLauncherFactory;
 import org.maemo.mica.common.core.process.ProcessLauncherUtils.Results;
 import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
 
+import java.util.*;
+
 public class MaemoRootstrapCommand extends AbstractSb2Command {
 	
 	public static final int INSTALLED_TARGETS = 0;

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/MaemoSdkCommand.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/MaemoSdkCommand.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/MaemoSdkCommand.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -10,16 +10,14 @@
  *******************************************************************************/
 package org.maemo.esbox.internal.scratchbox.sb2.command;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
-import org.maemo.esbox.internal.scratchbox.sb2.core.Scratchbox2SDK;
 import org.maemo.mica.common.core.MicaException;
 import org.maemo.mica.common.core.process.IProcessLauncherFactory;
 import org.maemo.mica.common.core.process.ProcessLauncherUtils.Results;
 import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class MaemoSdkCommand extends AbstractSb2Command{
 
 	public static final String STATUS_UP = "up";

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDKTarget.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDKTarget.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDKTarget.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -10,11 +10,7 @@
  *******************************************************************************/
 package org.maemo.esbox.internal.scratchbox.sb2.core;
 
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
 import org.maemo.esbox.internal.api.scratchbox.core.sdk.AbstractScratchboxSDKTarget;
 import org.maemo.esbox.internal.api.scratchbox.sb2.core.SB2PreferenceConstants;
 import org.maemo.esbox.internal.scratchbox.sb2.Activator;

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Sb2MaemoLauncherAdapter.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Sb2MaemoLauncherAdapter.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Sb2MaemoLauncherAdapter.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -10,33 +10,21 @@
  *******************************************************************************/
 package org.maemo.esbox.internal.scratchbox.sb2.launcher;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.ui.console.IPatternMatchListener;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.PatternMatchEvent;
-import org.eclipse.ui.console.TextConsole;
+import org.eclipse.ui.console.*;
 import org.maemo.esbox.internal.api.maemosdk.core.tools.IMaemoLauncherAdapter;
 import org.maemo.esbox.internal.api.maemosdk.core.tools.XLauncher;
 import org.maemo.esbox.internal.scratchbox.sb2.Activator;
-import org.maemo.esbox.internal.scratchbox.sb2.command.MaemoSdkCommand;
-import org.maemo.esbox.internal.scratchbox.sb2.core.Scratchbox2SDK;
+import org.maemo.esbox.internal.scratchbox.sb2.core.Scratchbox2SDKTarget;
 import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
 import org.maemo.esbox.scratchbox.sb2.sdk.IScratchbox2SDKTarget;
-import org.maemo.mica.common.core.CoreConsoleManager;
-import org.maemo.mica.common.core.CorePreferenceManager;
-import org.maemo.mica.common.core.ErrorLogger;
-import org.maemo.mica.common.core.MicaException;
+import org.maemo.mica.common.core.*;
 import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
 import org.maemo.mica.common.core.machine.IMachine;
-import org.maemo.mica.common.core.process.IProcessLauncher;
-import org.maemo.mica.common.core.process.IProcessLauncherFactory;
-import org.maemo.mica.common.core.process.ProcessLauncherCreator;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.common.core.process.*;
 
+import java.util.*;
+
 /**
  * @author baranov
  *
@@ -48,7 +36,7 @@
 	
 	public Sb2MaemoLauncherAdapter(IScratchbox2SDKTarget adaptableObject) {
 		target = adaptableObject;
-		command =  new MaemoCommand(target);
+		command =  new MaemoCommand((Scratchbox2SDKTarget) target);
 	}
 
 	/* (non-Javadoc)
@@ -93,9 +81,9 @@
 
 	static class MaemoCommand {
 
-		private ISDKTarget sdkTarget;
+		private Scratchbox2SDKTarget sdkTarget;
 
-		public MaemoCommand(ISDKTarget sdkTarget) {
+		public MaemoCommand(Scratchbox2SDKTarget sdkTarget) {
 			this.sdkTarget = sdkTarget;
 		}
 

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -17,7 +17,6 @@
 import org.maemo.mica.common.core.MicaException;
 import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
 import org.maemo.mica.common.core.process.*;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
 
 import java.util.List;
 

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncherFactory.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncherFactory.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncherFactory.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -15,7 +15,6 @@
 import org.maemo.esbox.scratchbox.sb2.sdk.IScratchbox2SDKTarget;
 import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
 import org.maemo.mica.common.core.process.IProcessLauncher;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
 import org.maemo.mica.internal.api.common.core.BaseProcessLauncherFactory;
 
 import java.util.List;

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -20,7 +20,6 @@
 import org.maemo.esbox.internal.scratchbox.sb2.Activator;
 import org.maemo.esbox.internal.scratchbox.sb2.ui.wizard.NewScratchbox2TargetWizard;
 import org.maemo.esbox.scratchbox.sb2.sdk.IScratchbox2SDK;
-import org.maemo.esbox.scratchbox.sb2.sdk.MaemoRootstrap;
 import org.maemo.mica.common.core.MicaException;
 import org.maemo.mica.common.core.Policy;
 import org.maemo.mica.common.core.adapters.ISDKManageTargetAdapter;

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences/Scratchbox2PreferencesPage.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences/Scratchbox2PreferencesPage.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences/Scratchbox2PreferencesPage.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -11,9 +11,7 @@
 
 package org.maemo.esbox.internal.scratchbox.sb2.ui.preferences;
 
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.RadioGroupFieldEditor;
-import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.jface.preference.*;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.layout.GridData;
@@ -44,6 +42,7 @@
 	private RadioGroupFieldEditor feSbox2LogLevel = null;
 
 	private StringFieldEditor feSbox2CommandLine;
+	private StringFieldEditor feSbox2EmulateMappingMode;
 
 	/**
 	 * The constructor
@@ -71,6 +70,10 @@
 				SB2PreferenceConstants.SB2_INSTALL_MAPPING_MODE.toString(),
 				"Install mapping mode:", getFieldEditorParent());
 
+		feSbox2EmulateMappingMode = new StringFieldEditor(
+				SB2PreferenceConstants.SB2_EMULATE_MAPPING_MODE.toString(),
+				"Emulate mapping mode:", getFieldEditorParent());
+		
 		feSbox2LogLevel = new RadioGroupFieldEditor(
 				SB2PreferenceConstants.SB2_LOG_LEVEL.toString(),
 				"Logging level:", 1, new String[][] { { "none", "" }, //$NON-NLS-1$
@@ -96,6 +99,7 @@
 
 		addField(feSbox2BuildMappingMode);
 		addField(feSbox2InstallMappingMode);
+		addField(feSbox2EmulateMappingMode);
 		addField(feSbox2LogLevel);
 		addField(feSbox2CommandLine);
 	}

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/MaemoRootstrapContentLabelProvider.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/MaemoRootstrapContentLabelProvider.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/MaemoRootstrapContentLabelProvider.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -51,7 +51,6 @@
 
 	private boolean rootstrapsFetched;
 	private List<String> rootstraps;
-	private Thread rootstrapThread;
 	private final IScratchbox2SDK sdk;
 	private final IWizardContainer wizardContainer;
 

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/TargetWizardRootstrapSb2Page.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/TargetWizardRootstrapSb2Page.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/TargetWizardRootstrapSb2Page.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -12,28 +12,14 @@
 
 package org.maemo.esbox.internal.scratchbox.sb2.ui.wizard;
 
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.jface.viewers.*;
 import org.eclipse.jface.wizard.WizardPage;
 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.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.swt.widgets.*;
 import org.maemo.esbox.internal.scratchbox.sb2.core.Scratchbox2SDK;
 import org.maemo.esbox.scratchbox.sb2.sdk.IScratchbox2SDK;
 import org.maemo.esbox.scratchbox.sb2.sdk.MaemoRootstrap;

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk/IScratchbox2SDK.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk/IScratchbox2SDK.java	2008-11-18 14:09:04 UTC (rev 949)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk/IScratchbox2SDK.java	2008-11-18 15:52:14 UTC (rev 950)
@@ -10,15 +10,12 @@
  *******************************************************************************/
 package org.maemo.esbox.scratchbox.sb2.sdk;
 
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
 import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
 import org.maemo.mica.common.core.MicaException;
-import org.maemo.mica.common.core.machine.IMachine;
 
+import java.util.List;
+
 public interface IScratchbox2SDK extends IScratchboxSDK {
 
 	/**

