[Esbox-commits] r836 - in branches/sdkPlugins/maemosdk: org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/scratchbox org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk org.maemo.esbox.maemosdk.sdk1 org.maemo.esbox.maemosdk.sdk1/META-INF org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1 org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/core org.maemo.esbox.maemosdk.sdk2 org.maemo.esbox.maemosdk.sdk2/META-INF org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/command org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/core org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands org.maemo.esbox.maemosdk.ui org.maemo.esbox.maemosdk.ui/META-INF org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/adapters org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards
baranov at garage.maemo.org
baranov at garage.maemo.org
Tue Oct 7 17:19:05 EEST 2008
Author: baranov
Date: 2008-10-07 17:19:05 +0300 (Tue, 07 Oct 2008)
New Revision: 836
Modified:
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters/MaemoGdbServerSupportAdapter.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/CreateMaemoRootstrapSb2Command.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/CreateTargetCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/CreateTargetSb2Command.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetCurrentTargetCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetCurrentTargetSb2Command.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetMaemoRootstrapLocationCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetVersionScratchboxCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/KillallCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListAvailableMaemoRootstrapsSb2Command.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListCompilersCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListCompilersSb2Command.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListCputranspCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListCputranspSb2Command.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListDevkitsCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListInstalledMaemoRootstrapsSb2Command.java
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/RemoveMaemoRootstrapSb2Command.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/RemoveTargetCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ResetTargetCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/RootstrapCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/SelectTargetCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ShowTargetCommand.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/maemosdk/core/OldStyleProjectProperties.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/scratchbox/ScratchboxFacade.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/scratchbox/ScratchboxTargetSwitcher.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/ScratchboxSDKFacade.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/META-INF/MANIFEST.MF
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/plugin.xml
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/Activator.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/core/ScratchboxSDK1.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/core/ScratchboxSDK1Target.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/META-INF/MANIFEST.MF
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/plugin.xml
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/command/GetMaemoRootstrapLocationCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/core/Scratchbox2FileSystemMapping.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/core/ScratchboxSDK2.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/TestCreateTargetCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestGdbQemuCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestListCommands.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/TestRemoveSb2Command.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestScratchboxFacade.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestSelectTargetCommand.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/META-INF/MANIFEST.MF
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/plugin.xml
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards/TargetWizardCPUMethod.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards/TargetWizardCompilerPage.java
branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards/TargetWizardNamePage.java
Log:
saving days work. To be completed.
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters/MaemoGdbServerSupportAdapter.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters/MaemoGdbServerSupportAdapter.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters/MaemoGdbServerSupportAdapter.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -29,7 +29,7 @@
public class MaemoGdbServerSupportAdapter implements IGdbServerSupportAdapter {
private final ISDKTarget sdkTarget;
-
+
public MaemoGdbServerSupportAdapter(ISDKTarget sdkTarget) {
this.sdkTarget = sdkTarget;
}
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/CreateMaemoRootstrapSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/CreateMaemoRootstrapSb2Command.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/CreateMaemoRootstrapSb2Command.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -16,6 +16,7 @@
import org.maemo.esbox.core.process.ProcessLauncherUtils;
import org.maemo.esbox.core.sdk.ISDK;
import org.maemo.esbox.maemosdk.core.SB2PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
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/CreateTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/CreateTargetCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/CreateTargetCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -14,6 +14,7 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.core.sdk.ISDK;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/CreateTargetSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/CreateTargetSb2Command.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/CreateTargetSb2Command.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -15,6 +15,7 @@
import org.maemo.esbox.core.sdk.ISDK;
import org.maemo.esbox.internal.maemosdk.core.Activator;
import org.maemo.esbox.maemosdk.core.SB2PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetCurrentTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetCurrentTargetCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetCurrentTargetCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,6 +13,7 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/GetCurrentTargetSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetCurrentTargetSb2Command.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetCurrentTargetSb2Command.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
import org.maemo.esbox.core.*;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/GetMaemoRootstrapLocationCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetMaemoRootstrapLocationCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetMaemoRootstrapLocationCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.Path;
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.maemosdk.core.SB2PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
import org.maemo.esbox.maemosdk.core.sdk.IScratchbox2SDKTarget;
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetVersionScratchboxCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetVersionScratchboxCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/GetVersionScratchboxCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -14,6 +14,7 @@
import org.maemo.esbox.core.*;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
import org.maemo.esbox.maemosdk.core.SB2PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/KillallCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/KillallCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/KillallCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,6 +13,7 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/ListAvailableMaemoRootstrapsSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListAvailableMaemoRootstrapsSb2Command.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListAvailableMaemoRootstrapsSb2Command.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,6 +13,7 @@
import org.maemo.esbox.core.*;
import org.maemo.esbox.core.process.ProcessLauncherUtils;
import org.maemo.esbox.maemosdk.core.SB2PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.scratchbox.MaemoRootstrap;
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/ListCompilersCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListCompilersCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListCompilersCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,6 +13,7 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/ListCompilersSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListCompilersSb2Command.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListCompilersSb2Command.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.Path;
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.internal.maemosdk.core.Activator;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/ListCputranspCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListCputranspCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListCputranspCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,6 +13,7 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/ListCputranspSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListCputranspSb2Command.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListCputranspSb2Command.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,6 +13,7 @@
import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.runtime.Path;
import org.maemo.esbox.core.ESboxException;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/ListDevkitsCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListDevkitsCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListDevkitsCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,6 +13,7 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/ListInstalledMaemoRootstrapsSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListInstalledMaemoRootstrapsSb2Command.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ListInstalledMaemoRootstrapsSb2Command.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -12,6 +12,7 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.maemosdk.core.SB2PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
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/MaemoCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/MaemoCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/MaemoCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -18,6 +18,7 @@
import org.maemo.esbox.core.sdk.ISDKTarget;
import org.maemo.esbox.internal.maemosdk.core.Activator;
import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/RemoveMaemoRootstrapSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/RemoveMaemoRootstrapSb2Command.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/RemoveMaemoRootstrapSb2Command.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -15,6 +15,7 @@
import org.maemo.esbox.core.process.ProcessLauncherUtils;
import org.maemo.esbox.maemosdk.core.SB2PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
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/RemoveTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/RemoveTargetCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/RemoveTargetCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -14,7 +14,9 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.core.sdk.ISDK;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.maemosdk.core.command.ListTargetsCommand;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/ResetTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ResetTargetCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ResetTargetCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,6 +13,7 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/RootstrapCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/RootstrapCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/RootstrapCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,6 +13,7 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/SelectTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/SelectTargetCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/SelectTargetCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,6 +13,7 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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/ShowTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ShowTargetCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/ShowTargetCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,6 +13,7 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/SimpleCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -14,6 +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.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/AddSbrshCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -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.maemosdk.core.command.scratchbox.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/ConfigureSbrshCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -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.maemosdk.core.command.scratchbox.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/MountTargetSbrshCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -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.maemosdk.core.command.scratchbox.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
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-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/command/scratchbox/sbrsh/UnmountTargetSbrshCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -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.maemosdk.core.command.scratchbox.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/OldStyleProjectProperties.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/OldStyleProjectProperties.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/OldStyleProjectProperties.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -11,19 +11,26 @@
package org.maemo.esbox.maemosdk.core;
+import java.text.MessageFormat;
+import java.util.Collection;
+import java.util.List;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.QualifiedName;
-import org.maemo.esbox.core.*;
-import org.maemo.esbox.core.execEnv.*;
+import org.maemo.esbox.core.ESboxException;
+import org.maemo.esbox.core.execEnv.ExecutionEnvironmentFactory;
+import org.maemo.esbox.core.execEnv.IExecutionEnvironment;
+import org.maemo.esbox.core.execEnv.UnknownExecutionEnvironment;
import org.maemo.esbox.core.sdk.ISDK;
import org.maemo.esbox.core.sdk.ISDKTarget;
import org.maemo.esbox.internal.maemosdk.core.Activator;
-import org.maemo.esbox.maemosdk.core.sdk.*;
+import org.maemo.esbox.maemosdk.core.sdk.IScratchbox1SDK;
+import org.maemo.esbox.maemosdk.core.sdk.IScratchbox2SDK;
+import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDK;
+import org.maemo.esbox.maemosdk.core.sdk.ScratchboxSDKFacade;
import org.maemo.esbox.project.core.IProjectProperties;
-import java.text.MessageFormat;
-
/**
* This class retrieves the old-style C/C++ or Python project properties stored in workspace metadata.
* @author eswartz
@@ -118,16 +125,26 @@
public ISDK getSDK() throws ESboxException {
ISDK sdk = null;
- String version = getScratchboxVersion(project);
+// String version = getScratchboxVersion(project);
+ String version = readProperty(scratchboxVersionProperty);
if (version == null) {
// old projects
version = "1";
}
- if (version.equals("1")) {
- sdk = ScratchboxSDKFacade.getInstance().getScratchbox1SDK();
- } else if (version.equals("2")) {
- sdk = ScratchboxSDKFacade.getInstance().getScratchbox2SDK();
+// if (version.equals("1")) {
+// sdk = ScratchboxSDKFacade.getInstance().getScratchbox1SDK();
+// } else if (version.equals("2")) {
+// sdk = ScratchboxSDKFacade.getInstance().getScratchbox2SDK();
+// }
+
+ List<IScratchboxSDK> sboxSDKs = ScratchboxSDKFacade.getInstance().getAllScratchboxSDKs();
+ for(IScratchboxSDK sboxSDK : sboxSDKs){
+ if(version.equals(sboxSDK.getMainVersion())){
+ sdk=sboxSDK;
+ break;
+ }
}
+
if (sdk == null) {
throw new ESboxException(
MessageFormat.format("Project ''{0}'' uses an unsupported scratchbox version {1}",
@@ -143,18 +160,24 @@
}
public synchronized String getSDKName() {
- String sboxVersion = readProperty(scratchboxVersionProperty);
- if (sboxVersion == null)
- return null;
- if (sboxVersion.equals("1"))
- return IScratchbox1SDK.NAME;
- if (sboxVersion.equals("2"))
- return IScratchbox2SDK.NAME;
+// String sboxVersion = readProperty(scratchboxVersionProperty);
+
+// if (sboxVersion == null)
+// return null;
+// if (sboxVersion.equals("1"))
+// return IScratchbox1SDK.NAME;
+// if (sboxVersion.equals("2"))
+// return IScratchbox2SDK.NAME;
+ ISDK sdk = null;
+ try{
+ sdk = getSDK();
+ return sdk.getName();
+ }catch(ESboxException e){}
return null;
}
- public synchronized String getScratchboxVersion(IProject project) {
- return readProperty(scratchboxVersionProperty);
- }
+// public synchronized String getScratchboxVersion(IProject project) {
+// return readProperty(scratchboxVersionProperty);
+// }
}
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/scratchbox/ScratchboxFacade.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/scratchbox/ScratchboxFacade.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/scratchbox/ScratchboxFacade.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -23,7 +23,9 @@
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.*;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.sbrsh.*;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.maemosdk.core.command.ListTargetsCommand;
import org.maemo.esbox.maemosdk.core.sdk.*;
+import org.maemo.esbox.maemosdk.sdk1.command.ListSessionsCommand;
import java.util.*;
@@ -41,7 +43,7 @@
* return cached data, but the machine will be acquired if the cache
* cannot satisfy the request.
*/
-public class ScratchboxFacade {
+public class ScratchboxFacade1 {
private static ScratchboxFacade singleton = null;
@@ -450,13 +452,14 @@
}
private int getSboxVersion(IScratchboxSDK sdk) throws ESboxException {
- if (sdk instanceof IScratchbox1SDK)
- return 1;
- else if (sdk instanceof IScratchbox2SDK)
- return 2;
- else
- throwBadESboxException(sdk);
- return 0;
+ int version = Integer.parseInt(sdk.getMainVersion());
+// if (sdk instanceof IScratchbox1SDK)
+// return 1;
+// else if (sdk instanceof IScratchbox2SDK)
+// return 2;
+// else
+// throwBadESboxException(sdk);
+ return version;
}
/**
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/scratchbox/ScratchboxTargetSwitcher.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/scratchbox/ScratchboxTargetSwitcher.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/scratchbox/ScratchboxTargetSwitcher.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -18,6 +18,7 @@
import org.maemo.esbox.internal.maemosdk.core.Activator;
import org.maemo.esbox.maemosdk.core.sdk.IScratchbox1SDK;
import org.maemo.esbox.maemosdk.core.sdk.IScratchbox1SDKTarget;
+import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDK;
import java.text.MessageFormat;
import java.util.List;
@@ -28,7 +29,7 @@
* @author eswartz
*
*/
-public abstract class ScratchboxTargetSwitcher {
+public abstract class ScratchboxTargetSwitcher1 {
/**
* Ensure the current SDK target can host the given target, asking
@@ -38,11 +39,11 @@
*/
public static void ensureCurrentTarget(ISDKTarget target) throws ESboxException {
// only scratchbox 1 cares about "current targets"
- if (!(target instanceof IScratchbox1SDKTarget)) {
+ if (!(target instanceof IScratchboxSDKTarget)) {
return;
}
- IScratchbox1SDK sdk = ((IScratchbox1SDK) target.getSDK());
+ IScratchboxSDK sdk = ((IScratchboxSDK) target.getSDK());
final String currentTarget = ScratchboxFacade.getInstance().getCurrentTarget(sdk);
final String targetName = target.getName();
if (currentTarget.equals(targetName)) {
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-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/IScratchboxSDK.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -78,4 +78,6 @@
public boolean unmountTarget(String targetName)
throws ESboxException;
+
+ public String getMainVersion();
}
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/ScratchboxSDKFacade.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/ScratchboxSDKFacade.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/sdk/ScratchboxSDKFacade.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.maemo.esbox.maemosdk.core.sdk;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.maemo.esbox.core.sdk.*;
@@ -24,7 +26,9 @@
*/
public class ScratchboxSDKFacade {
private static ScratchboxSDKFacade instance;
+ private List<IScratchboxSDK> scratchboxSDKs=null;
+
public static synchronized ScratchboxSDKFacade getInstance() {
if (instance == null) {
instance = new ScratchboxSDKFacade();
@@ -39,59 +43,87 @@
* @return {@link IScratchbox1SDK}, never <code>null</code>
* @throws ScratchboxException if no scratchbox 1 SDK available
* */
- public IScratchbox1SDK getScratchbox1SDK() throws ScratchboxException {
- List<ISDK> sdks = SDKFactory.getInstance().getSDKs();
- for (ISDK sdk : sdks) {
- if (sdk instanceof IScratchbox1SDK) {
- return (IScratchbox1SDK) sdk;
+ public List<IScratchboxSDK> getAllScratchboxSDKs() throws ScratchboxException {
+ if(scratchboxSDKs==null){
+ List<ISDK> sdks = SDKFactory.getInstance().getSDKs();
+ scratchboxSDKs = new ArrayList<IScratchboxSDK>();
+ for (ISDK sdk : sdks) {
+ if (sdk instanceof IScratchboxSDK) {
+ scratchboxSDKs.add((IScratchboxSDK)sdk);
+ }
}
}
- throw new ScratchboxException("No scratchbox 1 SDKs installed");
+ if(scratchboxSDKs.isEmpty())throw new ScratchboxException("No scratchbox SDKs installed");
+ return scratchboxSDKs;
}
+ public <SboxSDK extends IScratchboxSDK> List<SboxSDK> getScratchboxSDK(Class<SboxSDK> klass) throws ScratchboxException{
+ List<IScratchboxSDK> allSBoxSDKs = getAllScratchboxSDKs();
+ List<SboxSDK> result = new ArrayList<SboxSDK>();
+ for(IScratchboxSDK sdk : allSBoxSDKs){
+ if( klass.isInstance(sdk))
+ result.add((SboxSDK)sdk);
+ }
+ if(result.isEmpty()) throw new ScratchboxException("No "+klass.getName()+" installed");
+ return result;
+ }
/**
* Get the (first) scratchbox 2 installation on the system.
* @return {@link IScratchbox1SDK}, never <code>null</code>
* @throws ScratchboxException if no scratchbox 2 SDK available
* */
- public IScratchbox2SDK getScratchbox2SDK() throws ScratchboxException {
- List<ISDK> sdks = SDKFactory.getInstance().getSDKs();
- for (ISDK sdk : sdks) {
- if (sdk instanceof IScratchbox2SDK) {
- return (IScratchbox2SDK) sdk;
- }
- }
- throw new ScratchboxException("No scratchbox 2 SDKs installed");
- }
+// public IScratchbox2SDK getScratchbox2SDK() throws ScratchboxException {
+// List<ISDK> sdks = SDKFactory.getInstance().getSDKs();
+// for (ISDK sdk : sdks) {
+// if (sdk instanceof IScratchbox2SDK) {
+// return (IScratchbox2SDK) sdk;
+// }
+// }
+// throw new ScratchboxException("No scratchbox 2 SDKs installed");
+// }
/**
* Get all scratchbox targets
* @return array of IScratchboxSDKTarget, never <code>null</code>
*/
public IScratchboxSDKTarget[] getScratchboxSDKTargets() {
- ISDKTarget[] sb1Targets = new ISDKTarget[0];
- ISDKTarget[] sb2Targets = new ISDKTarget[0];
+// ISDKTarget[] sb1Targets = new ISDKTarget[0];
+// ISDKTarget[] sb2Targets = new ISDKTarget[0];
+// try {
+// sb1Targets = getScratchbox1SDK().getSDKTargets();
+// } catch (ScratchboxException e) {
+//
+// }
+// try {
+// sb2Targets = getScratchbox2SDK().getSDKTargets();
+// } catch (ScratchboxException e) {
+//
+// }
+//
+// IScratchboxSDKTarget[] sdkTargets = new IScratchboxSDKTarget[
+// sb1Targets.length + sb2Targets.length];
+// int idx = 0;
+// for (ISDKTarget sdkTarget : sb1Targets) {
+// sdkTargets[idx++] = (IScratchboxSDKTarget) sdkTarget;
+// }
+// for (ISDKTarget sdkTarget : sb2Targets) {
+// sdkTargets[idx++] = (IScratchboxSDKTarget) sdkTarget;
+// }
+
+ List<IScratchboxSDK> sboxSDKs = null;
+ List<IScratchboxSDKTarget> sdkTargets = new ArrayList<IScratchboxSDKTarget>();
try {
- sb1Targets = getScratchbox1SDK().getSDKTargets();
+ sboxSDKs = getAllScratchboxSDKs();
} catch (ScratchboxException e) {
}
- try {
- sb2Targets = getScratchbox2SDK().getSDKTargets();
- } catch (ScratchboxException e) {
-
+ for(IScratchboxSDK sboxSDK:sboxSDKs){
+ ISDKTarget[] targets = sboxSDK.getSDKTargets();
+ for(ISDKTarget target:targets)
+ if(target instanceof IScratchboxSDKTarget)
+ sdkTargets.add((IScratchboxSDKTarget)target);
}
- IScratchboxSDKTarget[] sdkTargets = new IScratchboxSDKTarget[
- sb1Targets.length + sb2Targets.length];
- int idx = 0;
- for (ISDKTarget sdkTarget : sb1Targets) {
- sdkTargets[idx++] = (IScratchboxSDKTarget) sdkTarget;
- }
- for (ISDKTarget sdkTarget : sb2Targets) {
- sdkTargets[idx++] = (IScratchboxSDKTarget) sdkTarget;
- }
-
- return sdkTargets;
+ return sdkTargets.toArray(new IScratchboxSDKTarget[sdkTargets.size()]);
}
}
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/META-INF/MANIFEST.MF
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/META-INF/MANIFEST.MF 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/META-INF/MANIFEST.MF 2008-10-07 14:19:05 UTC (rev 836)
@@ -5,9 +5,12 @@
Bundle-Version: 1.0.0
Bundle-Activator: org.maemo.esbox.maemosdk.sdk1.Activator
Require-Bundle: org.eclipse.core.runtime,
- org.maemo.esbox.maemosdk.core;bundle-version="1.5.0"
+ org.maemo.esbox.maemosdk.core;bundle-version="1.5.0",
+ org.eclipse.ui.ide;bundle-version="3.4.1",
+ org.maemo.esbox.maemosdk.ui;bundle-version="1.5.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: INdT / Nokia
-Export-Package: org.maemo.esbox.maemosdk.sdk1.core,
+Export-Package: org.maemo.esbox.maemosdk.sdk1.command,
+ org.maemo.esbox.maemosdk.sdk1.core,
org.maemo.esbox.maemosdk.sdk1.provider
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/plugin.xml
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/plugin.xml 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/plugin.xml 2008-10-07 14:19:05 UTC (rev 836)
@@ -7,5 +7,24 @@
class="org.maemo.esbox.maemosdk.sdk1.provider.ScratchboxSDK1Provider">
</sdk_provider>
</extension>
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ category="org.maemo.esbox.ui.esboxPreferencePage"
+ class="org.maemo.esbox.maemosdk.sdk1.ui.preferences.Scratchbox1PreferencesPage"
+ id="org.maemo.esbox.maemosdk.sdk1.esboxPreferencePage"
+ name="Scratchbox 1">
+ </page>
+ </extension>
+ <extension
+ point="org.eclipse.core.runtime.adapters">
+ <factory
+ adaptableType="org.maemo.esbox.core.sdk.ISDK"
+ class="org.maemo.esbox.maemosdk.sdk1.ui.adapters.MaemoSDKInstallTargetAdapterFactory">
+ <adapter
+ type="org.maemo.esbox.core.adapters.ISDKManageTargetAdapter">
+ </adapter>
+ </factory>
+ </extension>
</plugin>
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/Activator.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/Activator.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/Activator.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -1,6 +1,8 @@
package org.maemo.esbox.maemosdk.sdk1;
import org.eclipse.core.runtime.Plugin;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.maemo.esbox.core.ErrorLogger;
import org.osgi.framework.BundleContext;
@@ -71,9 +73,15 @@
}
/**
- * Return the error logger instance of this plug-in.
- *
- * @return the error logger instance of this plug-in.
+ * Returns an image descriptor for the image file at the given
+ * plug-in relative path.
+ *
+ * @param path the path
+ * @return the image descriptor
*/
+ public static ImageDescriptor getImageDescriptor(String path) {
+ return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+ }
+
}
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/core/ScratchboxSDK1.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/core/ScratchboxSDK1.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/core/ScratchboxSDK1.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -24,17 +24,17 @@
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListCompilersCommand;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListCputranspCommand;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListDevkitsCommand;
-import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListSessionsCommand;
-import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListTargetsCommand;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.RemoveTargetCommand;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.SelectTargetCommand;
import org.maemo.esbox.maemosdk.core.MaemoSDKEngine;
import org.maemo.esbox.maemosdk.core.MaemoSDKInfo;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.maemosdk.core.command.ListTargetsCommand;
import org.maemo.esbox.maemosdk.core.sdk.AbstractScratchboxSDK;
import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDKTarget;
import org.maemo.esbox.maemosdk.sdk1.Activator;
+import org.maemo.esbox.maemosdk.sdk1.command.ListSessionsCommand;
public class ScratchboxSDK1 extends AbstractScratchboxSDK implements
IScratchboxSDK1 {
@@ -55,8 +55,9 @@
// this.platformArchitectureProvider = platformArchitectureProvider;
}
-
+
+
@Override
public void refresh() {
super.refresh();
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/core/ScratchboxSDK1Target.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/core/ScratchboxSDK1Target.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk1/src/org/maemo/esbox/maemosdk/sdk1/core/ScratchboxSDK1Target.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -3,12 +3,9 @@
import org.eclipse.core.runtime.IPath;
import org.maemo.esbox.core.CorePreferenceConstants;
import org.maemo.esbox.core.process.IProcessLauncherFactory;
-import org.maemo.esbox.core.sdk.ISDK;
import org.maemo.esbox.core.sdk.ISDKPlatform;
-import org.maemo.esbox.internal.maemosdk.core.sdk.Scratchbox1FileSystemMapping;
-import org.maemo.esbox.internal.maemosdk.core.sdk.Scratchbox1ProcessLauncherFactory;
-import org.maemo.esbox.internal.maemosdk.core.sdk.Scratchbox1SDK;
import org.maemo.esbox.maemosdk.core.sdk.AbstractScratchboxSDKTarget;
+import org.maemo.esbox.maemosdk.sdk1.launcher.Scratchbox1ProcessLauncherFactory;
public class ScratchboxSDK1Target extends AbstractScratchboxSDKTarget {
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/META-INF/MANIFEST.MF
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/META-INF/MANIFEST.MF 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/META-INF/MANIFEST.MF 2008-10-07 14:19:05 UTC (rev 836)
@@ -5,7 +5,8 @@
Bundle-Version: 1.0.0
Bundle-Activator: org.maemo.esbox.maemosdk.sdk2.Activator
Require-Bundle: org.eclipse.core.runtime,
- org.maemo.esbox.maemosdk.core;bundle-version="1.5.0"
+ org.maemo.esbox.maemosdk.core;bundle-version="1.5.0",
+ org.eclipse.ui.ide;bundle-version="3.4.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.maemo.esbox.maemosdk.sdk2.command,
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/plugin.xml
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/plugin.xml 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/plugin.xml 2008-10-07 14:19:05 UTC (rev 836)
@@ -7,5 +7,14 @@
class="org.maemo.esbox.maemosdk.sdk2.provider.ScratchboxSDK2Provider">
</sdk_provider>
</extension>
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ category="org.maemo.esbox.ui.esboxPreferencePage"
+ class="org.maemo.esbox.maemosdk.sdk2.ui.preferences.Scratchbox2PreferencesPage"
+ id="org.maemo.esbox.maemosdk.sdk2.esboxPreferencePage"
+ name="Scratchbox 2">
+ </page>
+ </extension>
</plugin>
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/command/GetMaemoRootstrapLocationCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/command/GetMaemoRootstrapLocationCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/command/GetMaemoRootstrapLocationCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -15,8 +15,8 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.SB2PreferenceConstants;
+import org.maemo.esbox.maemosdk.core.ScratchboxInvalidParameterException;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxException;
import org.maemo.esbox.maemosdk.core.sdk.IScratchbox2SDKTarget;
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/core/Scratchbox2FileSystemMapping.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/core/Scratchbox2FileSystemMapping.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/core/Scratchbox2FileSystemMapping.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -12,7 +12,6 @@
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.scratchbox.ScratchboxFacade;
import org.maemo.esbox.maemosdk.sdk2.Activator;
import com.nokia.cpp.internal.api.utils.core.Pair;
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/core/ScratchboxSDK2.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/core/ScratchboxSDK2.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.sdk2/src/org/maemo/esbox/maemosdk/sdk2/core/ScratchboxSDK2.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -25,16 +25,16 @@
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.GetVersionScratchboxCommand;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListCompilersSb2Command;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListCputranspSb2Command;
-import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListTargetsCommand;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.RemoveMaemoRootstrapSb2Command;
-import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.RemoveTargetSb2Command;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ShowPathMappingSb2Command;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.maemosdk.core.command.ListTargetsCommand;
import org.maemo.esbox.maemosdk.core.sdk.AbstractScratchboxSDK;
import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDK;
import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDKTarget;
import org.maemo.esbox.maemosdk.sdk2.Activator;
import org.maemo.esbox.maemosdk.sdk2.command.GetMaemoRootstrapLocationCommand;
+import org.maemo.esbox.maemosdk.sdk2.command.RemoveTargetSb2Command;
public class ScratchboxSDK2 extends AbstractScratchboxSDK implements
IScratchboxSDK2 {
@@ -52,8 +52,7 @@
this.prefProvider = prefProvider;
}
-
-
+
@Override
public void refresh() {
super.refresh();
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-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/BaseTest.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -20,6 +20,8 @@
import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDK;
import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDKTarget;
import org.maemo.esbox.maemosdk.core.sdk.ScratchboxSDKFacade;
+import org.maemo.esbox.maemosdk.sdk1.core.ScratchboxSDK1;
+import org.maemo.esbox.maemosdk.sdk2.core.ScratchboxSDK2;
/**
* Base test for the ICommand tests
@@ -39,9 +41,9 @@
*/
@Before
public void setUp() throws Exception {
- this.sb1Sdk = ScratchboxSDKFacade.getInstance().getScratchbox1SDK();
+ this.sb1Sdk = ScratchboxSDKFacade.getInstance().getScratchboxSDK(ScratchboxSDK1.class).get(0);
this.sb1Command = sb1Sdk.getCommandAbstractor(); //ScratchboxFacade.getInstance().getCommandAbstractor(sb1Sdk);
- this.sb2Sdk = ScratchboxSDKFacade.getInstance().getScratchbox2SDK();
+ this.sb2Sdk = ScratchboxSDKFacade.getInstance().getScratchboxSDK(ScratchboxSDK2.class).get(0);
this.sb2Command = sb2Sdk.getCommandAbstractor();//ScratchboxFacade.getInstance().getCommandAbstractor(sb2Sdk);
if (sb2Sdk != null) {
for (ISDKTarget target : sb2Sdk.getSDKTargets()) {
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-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestCreateTargetCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -16,6 +16,7 @@
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.*;
import org.maemo.esbox.maemosdk.core.SB1PreferenceConstants;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.maemosdk.core.command.ListTargetsCommand;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
import java.util.ArrayList;
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestGdbQemuCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestGdbQemuCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestGdbQemuCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -10,32 +10,28 @@
*******************************************************************************/
package org.maemo.esbox.maemosdk.tests.commands;
-import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.core.sdk.ISDKTarget;
-import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxFacade;
-import org.maemo.esbox.maemosdk.core.sdk.*;
/**
* @author eswartz
*/
public class TestGdbQemuCommand extends BaseTest {
- public void testQemuVersionCommand() throws ESboxException {
- for (ISDKTarget sdkTarget : ScratchboxSDKFacade.getInstance().getScratchboxSDKTargets()) {
- String pattern = ScratchboxFacade.getInstance().getGdbQemuCommandPattern(sdkTarget,
- sdkTarget.getArchitecture());
- assertNotNull(pattern);
- if (sdkTarget instanceof IScratchbox2SDKTarget) {
- assertTrue(pattern.contains("${PORT}"));
- }
- if (sdkTarget.getArchitecture().equals(IScratchboxSDKTarget.ARCHITECTURE_ARMEL)) {
- assertTrue(pattern.contains("qemu-arm"));
- if (pattern.contains("qemu-arm-0.7"))
- assertFalse(pattern.contains("${PORT}"));
- else if (pattern.contains("qemu-arm-0.8"))
- assertTrue(pattern.contains("${PORT}"));
- }
- System.out.println("pattern of gdb-qemu for " + sdkTarget + " is " + pattern);
- }
- }
+// public void testQemuVersionCommand() throws ESboxException {
+// for (ISDKTarget sdkTarget : ScratchboxSDKFacade.getInstance().getScratchboxSDKTargets()) {
+// String pattern = ScratchboxFacade.getInstance().getGdbQemuCommandPattern(sdkTarget,
+// sdkTarget.getArchitecture());
+// assertNotNull(pattern);
+// if (sdkTarget instanceof IScratchbox2SDKTarget) {
+// assertTrue(pattern.contains("${PORT}"));
+// }
+// if (sdkTarget.getArchitecture().equals(IScratchboxSDKTarget.ARCHITECTURE_ARMEL)) {
+// assertTrue(pattern.contains("qemu-arm"));
+// if (pattern.contains("qemu-arm-0.7"))
+// assertFalse(pattern.contains("${PORT}"));
+// else if (pattern.contains("qemu-arm-0.8"))
+// assertTrue(pattern.contains("${PORT}"));
+// }
+// System.out.println("pattern of gdb-qemu for " + sdkTarget + " is " + pattern);
+// }
+// }
}
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestListCommands.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestListCommands.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestListCommands.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -23,9 +23,10 @@
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListCompilersCommand;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListCputranspCommand;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListDevkitsCommand;
-import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListSessionsCommand;
-import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.ListTargetsCommand;
+import org.maemo.esbox.maemosdk.core.command.ListTargetsCommand;
import org.maemo.esbox.maemosdk.core.sdk.ScratchboxSDKFacade;
+import org.maemo.esbox.maemosdk.sdk1.command.ListSessionsCommand;
+import org.maemo.esbox.maemosdk.sdk1.core.ScratchboxSDK1;
/**
* Please, read file TESTS.txt for more instructions about test.
@@ -239,7 +240,7 @@
// launch a new session (without switching targets!)
// ISDKTarget target = ScratchboxFacade.getInstance().getCurrentSDKTarget(ScratchboxSDKFacade.getInstance().getScratchbox1SDK());
- ISDKTarget target = ScratchboxSDKFacade.getInstance().getScratchbox1SDK().getCurrentSDKTarget();
+ ISDKTarget target = ScratchboxSDKFacade.getInstance().getScratchboxSDK(ScratchboxSDK1.class).get(0).getCurrentSDKTarget();
Process process = null;
try {
@@ -284,6 +285,7 @@
targetsExpected.add("BORA_X86");
targetsExpected.add("CHINOOK_ARMEL");
targetsExpected.add("CHINOOK_X86");
+ targetsExpected.add("DIABLO_ARMEL");
ListTargetsCommand listTargetsCommand = new ListTargetsCommand(sb1Command, 1);
List<String> targets = null;
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-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestListSb2Commands.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -20,6 +20,7 @@
import org.maemo.esbox.core.process.IProcessLauncherFactory;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.*;
import org.maemo.esbox.maemosdk.core.command.ICommandAbstractor;
+import org.maemo.esbox.maemosdk.core.command.ListTargetsCommand;
import org.maemo.esbox.maemosdk.core.scratchbox.MaemoRootstrap;
import java.util.*;
@@ -118,6 +119,7 @@
List<String> targetsExpected = new ArrayList<String>();
targetsExpected.add("bora31_armel");
targetsExpected.add("chinook40_armel");
+ targetsExpected.add("diablo41_armel");
ListTargetsCommand listTargetsCommand = new ListTargetsCommand(sb2Command, 2);
List<String> targets = null;
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestRemoveSb2Command.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestRemoveSb2Command.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestRemoveSb2Command.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -15,9 +15,9 @@
import java.util.List;
import org.maemo.esbox.core.ESboxException;
-import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.RemoveTargetSb2Command;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
import org.maemo.esbox.maemosdk.core.sdk.AbstractScratchboxSDK;
+import org.maemo.esbox.maemosdk.sdk2.command.RemoveTargetSb2Command;
/**
*/
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestScratchboxFacade.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestScratchboxFacade.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestScratchboxFacade.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -11,45 +11,48 @@
*******************************************************************************/
package org.maemo.esbox.maemosdk.tests.commands;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import junit.framework.TestCase;
+
import org.junit.Test;
-import org.maemo.esbox.core.*;
+import org.maemo.esbox.core.ESboxException;
+import org.maemo.esbox.core.HostUtils;
import org.maemo.esbox.core.machine.IMachine;
import org.maemo.esbox.core.machine.MachineRegistry;
-import org.maemo.esbox.core.process.*;
+import org.maemo.esbox.core.process.IProcessLauncher;
+import org.maemo.esbox.core.process.ProcessLauncherCreator;
import org.maemo.esbox.core.sdk.ISDKTarget;
-import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxFacade;
-import org.maemo.esbox.maemosdk.core.sdk.IScratchbox1SDK;
import org.maemo.esbox.maemosdk.core.sdk.ScratchboxSDKFacade;
+import org.maemo.esbox.maemosdk.sdk1.core.ScratchboxSDK1;
-import java.util.*;
-
-import junit.framework.TestCase;
-
/**
* Please, read file TESTS.txt for more instructions about test.
*/
public class TestScratchboxFacade extends TestCase {
- private IScratchbox1SDK sdk;
+ private ScratchboxSDK1 sdk;
static private List<String> cachedCputransps;
static private List<String> cachedCompilers;
@Override
protected void setUp() throws Exception {
super.setUp();
- this.sdk = ScratchboxSDKFacade.getInstance().getScratchbox1SDK();
+ this.sdk = ScratchboxSDKFacade.getInstance().getScratchboxSDK(ScratchboxSDK1.class).get(0);
}
/**
* Test method for
* {@link org.maemo.esbox.core.scratchbox.ScratchboxFacade#getInstance()}.
*/
- @Test
- public void testGetInstance() {
- ScratchboxFacade facadeA = ScratchboxFacade.getInstance();
- ScratchboxFacade facadeB = ScratchboxFacade.getInstance();
- assertSame(facadeA, facadeB);
- }
+// @Test
+// public void testGetInstance() {
+// ScratchboxFacade facadeA = ScratchboxFacade.getInstance();
+// ScratchboxFacade facadeB = ScratchboxFacade.getInstance();
+// assertSame(facadeA, facadeB);
+// }
/**
* Test method for
@@ -90,7 +93,7 @@
*/
private List<String> getCompilers() throws ESboxException {
if (cachedCompilers == null)
- cachedCompilers = ScratchboxFacade.getInstance().getCompilers(sdk);
+ cachedCompilers = sdk.getCompilers();//ScratchboxFacade.getInstance().getCompilers(sdk);
List<String> compilers = cachedCompilers;
return compilers;
}
@@ -172,7 +175,7 @@
*/
private List<String> getCputransps() throws ESboxException {
if (cachedCputransps == null)
- cachedCputransps = ScratchboxFacade.getInstance().getCputransp(sdk);
+ cachedCputransps = sdk.getCputransp();//ScratchboxFacade.getInstance().getCputransp(sdk);
List<String> cputransps = cachedCputransps;
return cputransps;
}
@@ -192,7 +195,7 @@
devkitsExpected.add("doctools");
devkitsExpected.add("perl");
- List<String> devkits = ScratchboxFacade.getInstance().getDevkits(sdk);
+ List<String> devkits = ((ScratchboxSDK1)sdk).getDevkits();//ScratchboxFacade.getInstance().getDevkits(sdk);
// just make sure there is at leasr one devkit and that one of them looks like
// something we recognize
@@ -227,8 +230,10 @@
targetsExpected.add("BORA_X86");
targetsExpected.add("CHINOOK_ARMEL");
targetsExpected.add("CHINOOK_X86");
+ targetsExpected.add("DIABLO_X86");
+ targetsExpected.add("DIABLO_ARMEL");
- List<String> targets = ScratchboxFacade.getInstance().getTargets(sdk);
+ List<String> targets = sdk.getTargets();//ScratchboxFacade.getInstance().getTargets(sdk);
// just make sure there is more than one target and that one of them looks like
// something we recognize
@@ -263,7 +268,8 @@
int numberOfSessions = 0;
- List<String> sessions = ScratchboxFacade.getInstance().getSessions(sdk);
+// List<String> sessions = ScratchboxFacade.getInstance().getSessions(sdk);
+ List<String> sessions = sdk.getSessions();
// make sure anything here is a pid
for (String pid : sessions) {
@@ -273,7 +279,8 @@
numberOfSessions = sessions.size();
// launch a new session (without switching targets!)
- ISDKTarget target = ScratchboxFacade.getInstance().getCurrentSDKTarget(ScratchboxSDKFacade.getInstance().getScratchbox1SDK());
+// ISDKTarget target = ScratchboxFacade.getInstance().getCurrentSDKTarget(ScratchboxSDKFacade.getInstance().getScratchbox1SDK());
+ ISDKTarget target = ScratchboxSDKFacade.getInstance().getScratchboxSDK(ScratchboxSDK1.class).get(0).getCurrentSDKTarget();
Process process = null;
try {
// need a PTY or else the shell fails to launch
@@ -283,9 +290,9 @@
process = launcher.createProcess();
// wait for it to really start
- Thread.sleep(1000);
+ Thread.sleep(5000);
- sessions = ScratchboxFacade.getInstance().getSessions(sdk);
+ sessions = sdk.getSessions();// ScratchboxFacade.getInstance().getSessions(sdk);
// this either launches 1 or 2 processes
assertTrue(numberOfSessions < sessions.size());
@@ -294,7 +301,9 @@
for (String pid : sessions) {
Integer.parseInt(pid);
}
- } finally {
+ } catch (Exception e) {
+ fail("Exception: "+e.getMessage());
+ }finally {
// kill the shell (exit, then send ctrl-d)
process.getOutputStream().write("exit\n004\004\004\004\004\004\004\004\004".getBytes());
process.destroy();
@@ -309,8 +318,7 @@
*/
@Test
public void testGetCurrentTarget() throws ESboxException {
- String currentTarget = ScratchboxFacade.getInstance()
- .getCurrentTarget(sdk);
+ String currentTarget = sdk.getCurrentTarget();//ScratchboxFacade.getInstance().getCurrentTarget(sdk);
assertTrue(currentTarget.length() > 0);
assertNotNull(sdk.findSDKTarget(currentTarget));
}
@@ -344,20 +352,27 @@
break;
}
}
- ScratchboxFacade.getInstance().createTarget(sdk,
+ List<String> targetsAvailable = sdk.getTargets();
+ if(targetsAvailable.contains(TARGET_NAME)){
+ sdk.removeTarget(TARGET_NAME);
+ targetsAvailable = sdk.getTargets();
+ }
+ assertFalse(targetsAvailable.contains(TARGET_NAME));
+
+ sdk.createTarget(
TARGET_NAME,
compiler,
"doctools:cputransp",
cputransp);
- List<String> targetsAvailable = ScratchboxFacade.getInstance()
- .getTargets(sdk);
+ targetsAvailable = sdk.getTargets();//ScratchboxFacade.getInstance().getTargets(sdk);
assertTrue(targetsAvailable.contains(TARGET_NAME));
// remove the target created for the test
- assertTrue(ScratchboxFacade.getInstance().removeTarget(sdk, TARGET_NAME));
+// assertTrue(ScratchboxFacade.getInstance().removeTarget(sdk, TARGET_NAME));
+ assertTrue(sdk.removeTarget(TARGET_NAME));
- targetsAvailable = ScratchboxFacade.getInstance().getTargets(sdk);
+ targetsAvailable = sdk.getTargets();//ScratchboxFacade.getInstance().getTargets(sdk);
assertTrue(!targetsAvailable.contains(TARGET_NAME));
}
@@ -372,7 +387,8 @@
final String TARGET_DOESNT_EXIST = "GHOST";
try {
- ScratchboxFacade.getInstance().removeTarget(sdk, TARGET_DOESNT_EXIST);
+// ScratchboxFacade.getInstance().removeTarget(sdk, TARGET_DOESNT_EXIST);
+ sdk.removeTarget(TARGET_DOESNT_EXIST);
fail("The target " + TARGET_DOESNT_EXIST
+ " does not exist. An error must be throwed.");
} catch (ESboxException e) {
@@ -380,9 +396,9 @@
}
// find a known target which isn't the current one
- List<String> targets = ScratchboxFacade.getInstance().getTargets(sdk);
+ List<String> targets = sdk.getTargets();//ScratchboxFacade.getInstance().getTargets(sdk);
- String currentTarget = ScratchboxFacade.getInstance().getCurrentTarget(sdk);
+ String currentTarget = sdk.getCurrentTarget();//ScratchboxFacade.getInstance().getCurrentTarget(sdk);
String theTarget = null;
for (String target : targets) {
@@ -392,13 +408,13 @@
}
}
- String lastTarget = ScratchboxFacade.getInstance().getCurrentTarget(sdk);
+ String lastTarget = sdk.getCurrentTarget();//ScratchboxFacade.getInstance().getCurrentTarget(sdk);
assertTrue(lastTarget != null && lastTarget.length() > 0);
- assertTrue(ScratchboxFacade.getInstance().selectTarget(sdk, theTarget));
+// assertTrue(ScratchboxFacade.getInstance().selectTarget(sdk, theTarget));
+ assertTrue(sdk.selectTarget(theTarget));
- currentTarget = ScratchboxFacade.getInstance()
- .getCurrentTarget(sdk);
+ currentTarget = sdk.getCurrentTarget();//ScratchboxFacade.getInstance().getCurrentTarget(sdk);
assertEquals(theTarget, currentTarget);
}
@@ -413,7 +429,7 @@
for (IMachine machine : MachineRegistry.getInstance().getBuildMachines()) {
String sboxVersion;
try {
- sboxVersion = ScratchboxFacade.getInstance().getCurrentSbox1Version(machine);
+ sboxVersion = sdk.getCurrentSboxVersion(machine);//ScratchboxFacade.getInstance().getCurrentSbox1Version(machine);
assertTrue(sboxVersion.matches("1\\.0\\.\\d+"));
} catch (ESboxException e) {
System.out.println("No Scratchbox on " + machine);
@@ -497,13 +513,13 @@
*
* @throws ESboxException
*/
- @Test
- public void testExecSimpleCommand() throws ESboxException {
- ISDKTarget sdkTarget = sdk.getSDKTargets()[0];
- List<String> currentTarget = ScratchboxFacade.getInstance().execSimpleCommand(
- sdkTarget,
- CommandLineArguments.createFromVarArgs("sb-conf", "current"));
- assertEquals(sdkTarget.getName(), currentTarget.get(0));
- }
+// @Test
+// public void testExecSimpleCommand() throws ESboxException {
+// ISDKTarget sdkTarget = sdk.getSDKTargets()[0];
+// List<String> currentTarget = ScratchboxFacade.getInstance().execSimpleCommand(
+// sdkTarget,
+// CommandLineArguments.createFromVarArgs("sb-conf", "current"));
+// assertEquals(sdkTarget.getName(), currentTarget.get(0));
+// }
}
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestSelectTargetCommand.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestSelectTargetCommand.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/maemosdk/tests/commands/TestSelectTargetCommand.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,6 +13,7 @@
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.internal.maemosdk.core.command.scratchbox.*;
+import org.maemo.esbox.maemosdk.core.command.ListTargetsCommand;
import org.maemo.esbox.maemosdk.core.command.ScratchboxCommand;
import java.util.ArrayList;
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/META-INF/MANIFEST.MF 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/META-INF/MANIFEST.MF 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,3 +13,9 @@
org.eclipse.ui.ide;bundle-version="3.4.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
+Export-Package: org.maemo.esbox.maemosdk.ui,
+ org.maemo.esbox.maemosdk.ui.actions,
+ org.maemo.esbox.maemosdk.ui.adapters,
+ org.maemo.esbox.maemosdk.ui.preferences,
+ org.maemo.esbox.maemosdk.ui.targets.wizards,
+ org.maemo.esbox.maemosdk.ui.targets.wizards.sbrsh
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/plugin.xml
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/plugin.xml 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/plugin.xml 2008-10-07 14:19:05 UTC (rev 836)
@@ -20,18 +20,6 @@
id="org.maemo.esbox.maemosdk.ui.esboxPreferencePage.gazpacho">
</page>
- <page
- category="org.maemo.esbox.ui.esboxPreferencePage"
- class="org.maemo.esbox.maemosdk.ui.preferences.Scratchbox1PreferencesPage"
- id="org.maemo.esbox.maemosdk.ui.esboxPreferencePage.scratchbox1"
- name="Scratchbox 1">
- </page>
- <page
- category="org.maemo.esbox.ui.esboxPreferencePage"
- class="org.maemo.esbox.maemosdk.ui.preferences.Scratchbox2PreferencesPage"
- id="org.maemo.esbox.maemosdk.ui.esboxPreferencePage.scratchbox2"
- name="Scratchbox 2">
- </page>
<page
name="X Server"
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -21,6 +21,7 @@
import org.maemo.esbox.core.sdk.ISDKTarget;
import org.maemo.esbox.internal.maemosdk.ui.UIActivator;
import org.maemo.esbox.maemosdk.core.sdk.IScratchbox1SDK;
+import org.maemo.esbox.maemosdk.ui.adapters.MaemoScratchboxSDKManageTargetAdapterBase;
import org.maemo.esbox.maemosdk.ui.targets.wizards.NewScratchbox1TargetWizard;
import java.util.List;
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -21,6 +21,7 @@
import org.maemo.esbox.core.sdk.ISDKTarget;
import org.maemo.esbox.internal.maemosdk.ui.UIActivator;
import org.maemo.esbox.maemosdk.core.sdk.IScratchbox2SDK;
+import org.maemo.esbox.maemosdk.ui.adapters.MaemoScratchboxSDKManageTargetAdapterBase;
import org.maemo.esbox.maemosdk.ui.targets.wizards.NewScratchbox2TargetWizard;
import java.util.List;
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards/TargetWizardCPUMethod.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards/TargetWizardCPUMethod.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards/TargetWizardCPUMethod.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,21 +13,23 @@
package org.maemo.esbox.maemosdk.ui.targets.wizards;
+import java.util.List;
+
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.*;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.core.ErrorLogger;
import org.maemo.esbox.internal.maemosdk.ui.UIActivator;
-import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxFacade;
import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDK;
-import java.util.List;
-
/**
* This pages shows the CPU-transparency method that the user can choose for his/her
* target. The CPU-transparency method provides a way so that the user can execute the
@@ -36,7 +38,10 @@
*/
public class TargetWizardCPUMethod extends WizardPage implements IValidatePage {
- protected Table table;
+ private Table table;
+
+
+
private boolean sbrshConfigure;
private IScratchboxSDK sdk;
@@ -53,6 +58,11 @@
this.sdk = sdk;
}
+ public Table getTable() {
+ return table;
+ }
+
+
/*
* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
@@ -100,7 +110,8 @@
private void inicializeTable() {
List<String> targetMethod = null;
try {
- targetMethod = ScratchboxFacade.getInstance().getCputransp(sdk);
+// targetMethod = ScratchboxFacade.getInstance().getCputransp(sdk);
+ targetMethod = sdk.getCputransp();
} catch (ESboxException e) {
ErrorLogger errorLogger = UIActivator.getErrorLogger();
errorLogger.logAndShowError("Cannot get list of CPU-Transparency Method", e);
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards/TargetWizardCompilerPage.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards/TargetWizardCompilerPage.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards/TargetWizardCompilerPage.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -13,21 +13,23 @@
package org.maemo.esbox.maemosdk.ui.targets.wizards;
+import java.util.List;
+
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.*;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
import org.maemo.esbox.core.ESboxException;
import org.maemo.esbox.core.ErrorLogger;
import org.maemo.esbox.internal.maemosdk.ui.UIActivator;
-import org.maemo.esbox.maemosdk.core.scratchbox.ScratchboxFacade;
import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDK;
-import java.util.List;
-
/**
* This pages shows the compilers that the user can choose for his/her
* target. The compilers are disposed as a list with checkbox, so the user
@@ -36,7 +38,7 @@
*/
public class TargetWizardCompilerPage extends WizardPage implements IValidatePage {
- protected Table table;
+ private Table table;
private IScratchboxSDK sdk;
/**
@@ -50,6 +52,10 @@
setPageComplete(false);
}
+ public Table getTableControl(){
+ return table;
+ }
+
/*
* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
@@ -82,7 +88,8 @@
private void inicializeTable() {
List<String> compilers = null;
try {
- compilers = ScratchboxFacade.getInstance().getCompilers(sdk);
+// compilers = ScratchboxFacade.getInstance().getCompilers(sdk);
+ compilers = sdk.getCompilers();
} catch (ESboxException e) {
ErrorLogger errorLogger = UIActivator.getErrorLogger();
errorLogger.logAndShowError("Cannot get list of compilers", e);
Modified: branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards/TargetWizardNamePage.java
===================================================================
--- branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards/TargetWizardNamePage.java 2008-10-06 23:45:30 UTC (rev 835)
+++ branches/sdkPlugins/maemosdk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/maemosdk/ui/targets/wizards/TargetWizardNamePage.java 2008-10-07 14:19:05 UTC (rev 836)
@@ -27,7 +27,7 @@
*/
public class TargetWizardNamePage extends WizardPage implements IValidatePage, TargetListener {
- protected Text text;
+ private Text text;
private IScratchboxSDK sdk;
/**
@@ -42,6 +42,9 @@
setPageComplete(false);
}
+ public Text getTextControl(){
+ return text;
+ }
/*
* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
More information about the Esbox-commits
mailing list